Title: [132573] trunk/Source/WebCore
- Revision
- 132573
- Author
- [email protected]
- Date
- 2012-10-25 22:41:30 -0700 (Thu, 25 Oct 2012)
Log Message
A mistake in WebCore::_javascript_CallFrame::evaluate which will cause assert failed
https://bugs.webkit.org/show_bug.cgi?id=100347
Patch by Peter Wang <[email protected]> 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/_javascript_CallFrame.cpp:
(WebCore::_javascript_CallFrame::evaluate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132572 => 132573)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 05:25:48 UTC (rev 132572)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 05:41:30 UTC (rev 132573)
@@ -1,3 +1,18 @@
+2012-10-25 Peter Wang <[email protected]>
+
+ A mistake in WebCore::_javascript_CallFrame::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/_javascript_CallFrame.cpp:
+ (WebCore::_javascript_CallFrame::evaluate):
+
2012-10-25 Adam Barth <[email protected]>
[V8] We can merge the wrapper maps for DOM objects and active DOM objects
Modified: trunk/Source/WebCore/bindings/js/_javascript_CallFrame.cpp (132572 => 132573)
--- trunk/Source/WebCore/bindings/js/_javascript_CallFrame.cpp 2012-10-26 05:25:48 UTC (rev 132572)
+++ trunk/Source/WebCore/bindings/js/_javascript_CallFrame.cpp 2012-10-26 05:41:30 UTC (rev 132573)
@@ -115,7 +115,7 @@
if (!m_isValid)
return jsNull();
- JSLockHolder lock(JSDOMWindowBase::commonJSGlobalData());
+ JSLockHolder lock(m_debuggerCallFrame.callFrame());
return m_debuggerCallFrame.evaluate(script, exception);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
