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>

1 files changed, 10 insertions, 10 deletions

diff --git a/Source/WebKit/win/WebCoreStatistics.cpp b/Source/WebKit/win/WebCoreStatistics.cpp
index 2f22b03c6..9dd0d01c3 100644
--- a/Source/WebKit/win/WebCoreStatistics.cpp
+++ b/Source/WebKit/win/WebCoreStatistics.cpp
@@ -98,8 +98,8 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::javaScriptObjectsCount(
     if (!count)
         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;
 }
 
@@ -109,8 +109,8 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::javaScriptGlobalObjectsCount(
     if (!count)
         return E_POINTER;
 
-    JSLockHolder lock(JSDOMWindow::commonJSGlobalData());
-    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.globalObjectCount();
+    JSLockHolder lock(JSDOMWindow::commonVM());
+    *count = (UINT)JSDOMWindow::commonVM()->heap.globalObjectCount();
     return S_OK;
 }
 
@@ -120,8 +120,8 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::javaScriptProtectedObjectsCount(
     if (!count)
         return E_POINTER;
 
-    JSLockHolder lock(JSDOMWindow::commonJSGlobalData());
-    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.protectedObjectCount();
+    JSLockHolder lock(JSDOMWindow::commonVM());
+    *count = (UINT)JSDOMWindow::commonVM()->heap.protectedObjectCount();
     return S_OK;
 }
 
@@ -131,16 +131,16 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::javaScriptProtectedGlobalObjectsCou
     if (!count)
         return E_POINTER;
 
-    JSLockHolder lock(JSDOMWindow::commonJSGlobalData());
-    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.protectedGlobalObjectCount();
+    JSLockHolder lock(JSDOMWindow::commonVM());
+    *count = (UINT)JSDOMWindow::commonVM()->heap.protectedGlobalObjectCount();
     return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE WebCoreStatistics::javaScriptProtectedObjectTypeCounts( 
     /* [retval][out] */ IPropertyBag2** typeNamesAndCounts)
 {
-    JSLockHolder lock(JSDOMWindow::commonJSGlobalData());
-    OwnPtr<TypeCountSet> jsObjectTypeNames(JSDOMWindow::commonJSGlobalData()->heap.protectedObjectTypeCounts());
+    JSLockHolder lock(JSDOMWindow::commonVM());
+    OwnPtr<TypeCountSet> jsObjectTypeNames(JSDOMWindow::commonVM()->heap.protectedObjectTypeCounts());
     typedef TypeCountSet::const_iterator Iterator;
     Iterator end = jsObjectTypeNames->end();
     HashMap<String, int> typeCountMap;