Changeset 132573 in webkit

Timestamp:

Oct 25, 2012 10:41:30 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

A mistake in WebCore::JavaScriptCallFrame::evaluate which will cause assert failed
​https://bugs.webkit.org/show_bug.cgi?id=100347

Patch by Peter Wang <​peter.wang@torchmobile.com.cn> on 2012-10-25
Reviewed by Mark Lam and Filip Pizlo.

In worker context, calling "JSDOMWindowBase::commonJSGlobalData" will cause assert,
since there is "ASSERT(isMainThread())" in "JSDOMWindowBase::commonJSGlobalData".

No new test case, since no behaviour changed.

• bindings/js/JavaScriptCallFrame.cpp:

(WebCore::JavaScriptCallFrame::evaluate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JavaScriptCallFrame.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-25  Peter Wang  <peter.wang@torchmobile.com.cn>
+
+        A mistake in WebCore::JavaScriptCallFrame::evaluate which will cause assert failed
+        https://bugs.webkit.org/show_bug.cgi?id=100347
+
+        Reviewed by Mark Lam and Filip Pizlo.
+
+        In worker context, calling "JSDOMWindowBase::commonJSGlobalData" will cause assert,
+        since there is "ASSERT(isMainThread())" in "JSDOMWindowBase::commonJSGlobalData".
+
+        No new test case, since no behaviour changed.
+
+        * bindings/js/JavaScriptCallFrame.cpp:
+        (WebCore::JavaScriptCallFrame::evaluate):
+
 2012-10-25  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/bindings/js/JavaScriptCallFrame.cpp

@@ -116 +116 @@
         return jsNull();
 
-    JSLockHolder lock(JSDOMWindowBase::commonJSGlobalData());
+    JSLockHolder lock(m_debuggerCallFrame.callFrame());
     return m_debuggerCallFrame.evaluate(script, exception);
 }