Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
98db6a0d
Commit
98db6a0d
authored
Mar 12, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Move cycle collection to detach_gecko_browser.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
96604df6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
htmldoc.c
dlls/mshtml/htmldoc.c
+0
-11
nsembed.c
dlls/mshtml/nsembed.c
+10
-0
No files found.
dlls/mshtml/htmldoc.c
View file @
98db6a0d
...
...
@@ -5300,11 +5300,6 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface)
TRACE
(
"(%p) ref = %u
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
nsIDOMWindowUtils
*
window_utils
=
NULL
;
if
(
This
->
basedoc
.
window
&&
This
->
basedoc
.
window
->
nswindow
)
get_nsinterface
((
nsISupports
*
)
This
->
basedoc
.
window
->
nswindow
,
&
IID_nsIDOMWindowUtils
,
(
void
**
)
&
window_utils
);
if
(
This
->
basedoc
.
doc_node
)
{
This
->
basedoc
.
doc_node
->
basedoc
.
doc_obj
=
NULL
;
htmldoc_release
(
&
This
->
basedoc
.
doc_node
->
basedoc
);
...
...
@@ -5344,12 +5339,6 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface)
if
(
This
->
nscontainer
)
detach_gecko_browser
(
This
->
nscontainer
);
heap_free
(
This
);
/* Force cycle collection */
if
(
window_utils
)
{
nsIDOMWindowUtils_CycleCollect
(
window_utils
,
NULL
,
0
);
nsIDOMWindowUtils_Release
(
window_utils
);
}
}
return
ref
;
...
...
dlls/mshtml/nsembed.c
View file @
98db6a0d
...
...
@@ -2181,11 +2181,15 @@ HRESULT create_gecko_browser(HTMLDocumentObj *doc, GeckoBrowser **_ret)
void
detach_gecko_browser
(
GeckoBrowser
*
This
)
{
nsIDOMWindowUtils
*
window_utils
=
NULL
;
TRACE
(
"(%p)
\n
"
,
This
);
This
->
doc
=
NULL
;
if
(
This
->
content_window
)
{
get_nsinterface
((
nsISupports
*
)
This
->
content_window
->
nswindow
,
&
IID_nsIDOMWindowUtils
,
(
void
**
)
&
window_utils
);
IHTMLWindow2_Release
(
&
This
->
content_window
->
base
.
IHTMLWindow2_iface
);
This
->
content_window
=
NULL
;
}
...
...
@@ -2243,6 +2247,12 @@ void detach_gecko_browser(GeckoBrowser *This)
}
nsIWebBrowserChrome_Release
(
&
This
->
nsIWebBrowserChrome_iface
);
/* Force cycle collection */
if
(
window_utils
)
{
nsIDOMWindowUtils_CycleCollect
(
window_utils
,
NULL
,
0
);
nsIDOMWindowUtils_Release
(
window_utils
);
}
}
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment