[PATCH v2 08/12] mshtml: Ensure SnowWhite objects are cleared when forcing cycle collection.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/nsembed.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 8d437278d0b..59a77039de3 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -2298,6 +2298,7 @@ static void force_cycle_collection(nsIDOMWindowUtils *window_utils)
         goto collect;
     }

+    /* Note that AllTraces logger merely sets a flag on the original, so it can't be re-used */
     nsres = nsICycleCollectorListener_AllTraces(logger, &all_logger);
     nsICycleCollectorListener_Release(logger);
     logger = NULL;
@@ -2313,6 +2314,19 @@ collect:
     nsIDOMWindowUtils_CycleCollect(window_utils, logger, 0);
     if(logger)
         nsICycleCollectorListener_Release(logger);
+
+    /* Collection might have marked objects as SnowWhite, ensure they're cleaned up now,
+       but use a normal logger here that does *not* force the CC, to avoid wasting time. */
+    nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_CYCLECOLLECTORLOGGER_CONTRACTID, &IID_nsICycleCollectorListener, (void**)&logger);
+    if(NS_FAILED(nsres))
+        logger = NULL;
+    else {
+        nsres = nsICycleCollectorListener_SetLogSink(logger, &dummy_log_sink);
+        assert(nsres == NS_OK);
+    }
+    nsIDOMWindowUtils_CycleCollect(window_utils, logger, 0);
+    if(logger)
+        nsICycleCollectorListener_Release(logger);
 }

static HRESULT init_browser(GeckoBrowser *browser)