Title: [127183] trunk/Source/WebKit/blackberry
Revision
127183
Author
[email protected]
Date
2012-08-30 13:34:48 -0700 (Thu, 30 Aug 2012)

Log Message

[BlackBerry] ASSERT failure in JSC::MarkedAllocator::allocateSlowCase
https://bugs.webkit.org/show_bug.cgi?id=95492

Reviewed by Yong Li.
Patch by Jacky Jiang  <[email protected]>

PR: 200724
Hold the JSLock for the current thread before we call toRef to avoid
the ASSERT failure.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::executeJavaScript):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (127182 => 127183)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-08-30 20:30:49 UTC (rev 127182)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-08-30 20:34:48 UTC (rev 127183)
@@ -744,6 +744,7 @@
     JSC::ExecState* exec = m_mainFrame->script()->globalObject(mainThreadNormalWorld())->globalExec();
     JSGlobalContextRef context = toGlobalRef(exec);
 
+    JSC::JSLockHolder lock(exec);
     JSType type = JSValueGetType(context, toRef(exec, value));
 
     switch (type) {

Modified: trunk/Source/WebKit/blackberry/ChangeLog (127182 => 127183)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-30 20:30:49 UTC (rev 127182)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-30 20:34:48 UTC (rev 127183)
@@ -1,3 +1,17 @@
+2012-08-30  Jacky Jiang  <[email protected]>
+
+        [BlackBerry] ASSERT failure in JSC::MarkedAllocator::allocateSlowCase
+        https://bugs.webkit.org/show_bug.cgi?id=95492
+
+        Reviewed by Yong Li.
+
+        PR: 200724
+        Hold the JSLock for the current thread before we call toRef to avoid
+        the ASSERT failure.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::executeJavaScript):
+
 2012-08-30  Antonio Gomes  <[email protected]>
 
         [BlackBerry] Remove unneeded force-immediate-repaint from InRegionScroller::setLayerScrollPosition
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to