diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebKit/win/WebJavaScriptCollector.cpp | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebKit/win/WebJavaScriptCollector.cpp')
| -rw-r--r-- | Source/WebKit/win/WebJavaScriptCollector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/win/WebJavaScriptCollector.cpp b/Source/WebKit/win/WebJavaScriptCollector.cpp index cb56b27e2..7b2f67fa6 100644 --- a/Source/WebKit/win/WebJavaScriptCollector.cpp +++ b/Source/WebKit/win/WebJavaScriptCollector.cpp @@ -111,7 +111,7 @@ HRESULT STDMETHODCALLTYPE WebJavaScriptCollector::objectCount( return E_POINTER; } - JSLock lock(SilenceAssertionsOnly); + JSLockHolder lock(JSDOMWindow::commonJSGlobalData()); *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.objectCount(); return S_OK; } |