From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 Aug 2009 17:01:47 +0100
Subject: Merge in WebKit r47029.

---
 WebKitTools/DumpRenderTree/win/GCControllerWin.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'WebKitTools/DumpRenderTree/win/GCControllerWin.cpp')

diff --git a/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp b/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp
index 547aabc..b867250 100644
--- a/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp
@@ -32,11 +32,12 @@
 #include "DumpRenderTree.h"
 #include <WebCore/COMPtr.h>
 #include <WebKit/WebKit.h>
+#include <WebKit/WebKitCOMAPI.h>
 
 void GCController::collect() const
 {
     COMPtr<IWebJavaScriptCollector> collector;
-    if (FAILED(::CoCreateInstance(CLSID_WebJavaScriptCollector, 0, CLSCTX_ALL, IID_IWebJavaScriptCollector, (void**)&collector)))
+    if (FAILED(WebKitCreateInstance(CLSID_WebJavaScriptCollector, 0, IID_IWebJavaScriptCollector, (void**)&collector)))
         return;
     collector->collect();
 }
@@ -44,7 +45,7 @@ void GCController::collect() const
 void GCController::collectOnAlternateThread(bool waitUntilDone) const
 {
     COMPtr<IWebJavaScriptCollector> collector;
-    if (FAILED(::CoCreateInstance(CLSID_WebJavaScriptCollector, 0, CLSCTX_ALL, IID_IWebJavaScriptCollector, (void**)&collector)))
+    if (FAILED(WebKitCreateInstance(CLSID_WebJavaScriptCollector, 0, IID_IWebJavaScriptCollector, (void**)&collector)))
         return;
     collector->collectOnAlternateThread(waitUntilDone ? TRUE : FALSE);
 }
@@ -52,7 +53,7 @@ void GCController::collectOnAlternateThread(bool waitUntilDone) const
 size_t GCController::getJSObjectCount() const
 {
     COMPtr<IWebJavaScriptCollector> collector;
-    if (FAILED(::CoCreateInstance(CLSID_WebJavaScriptCollector, 0, CLSCTX_ALL, IID_IWebJavaScriptCollector, (void**)&collector)))
+    if (FAILED(WebKitCreateInstance(CLSID_WebJavaScriptCollector, 0, IID_IWebJavaScriptCollector, (void**)&collector)))
         return 0;
     UINT objects = 0;
     collector->objectCount(&objects);
-- 
cgit v1.1