diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKitTools/DumpRenderTree/win/GCControllerWin.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKitTools/DumpRenderTree/win/GCControllerWin.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/win/GCControllerWin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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); |