diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit/win/WebJavaScriptCollector.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit/win/WebJavaScriptCollector.cpp')
| -rw-r--r-- | Source/WebKit/win/WebJavaScriptCollector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/win/WebJavaScriptCollector.cpp b/Source/WebKit/win/WebJavaScriptCollector.cpp index 7b2f67fa6..98f4431c7 100644 --- a/Source/WebKit/win/WebJavaScriptCollector.cpp +++ b/Source/WebKit/win/WebJavaScriptCollector.cpp @@ -28,7 +28,7 @@ #include "WebJavaScriptCollector.h" #include <JavaScriptCore/Heap.h> -#include <JavaScriptCore/JSGlobalData.h> +#include <JavaScriptCore/VM.h> #include <WebCore/GCController.h> #include <WebCore/JSDOMWindow.h> #include <runtime/JSLock.h> @@ -111,7 +111,7 @@ HRESULT STDMETHODCALLTYPE WebJavaScriptCollector::objectCount( return E_POINTER; } - JSLockHolder lock(JSDOMWindow::commonJSGlobalData()); - *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.objectCount(); + JSLockHolder lock(JSDOMWindow::commonVM()); + *count = (UINT)JSDOMWindow::commonVM()->heap.objectCount(); return S_OK; } |