Title: [132653] trunk/Source/WebKit/blackberry
- Revision
- 132653
- Author
- [email protected]
- Date
- 2012-10-26 07:30:12 -0700 (Fri, 26 Oct 2012)
Log Message
[BlackBerry] ASSERT currentThreadIsHoldingLock() failed in MarkedAllocator::allocateSlowCase()
https://bugs.webkit.org/show_bug.cgi?id=100504
Patch by Sean Wang <[email protected]> on 2012-10-26
Reviewed by Yong Li.
PR #232038 The similar PR # 200724.
Reviewed internally by Petter Wang.
This issue is same as bug 95492, and this patch is same as its patch.
Hold the JSLock for the current thread before we call toRef to avoid
the ASSERT failure.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::executeJavaScriptInIsolatedWorld):
(BlackBerry::WebKit::WebPage::executeJavaScriptFunction):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (132652 => 132653)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-10-26 14:26:09 UTC (rev 132652)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-10-26 14:30:12 UTC (rev 132653)
@@ -836,6 +836,7 @@
JSC::ExecState* exec = m_mainFrame->script()->globalObject(m_isolatedWorld.get())->globalExec();
JSGlobalContextRef context = toGlobalRef(exec);
+ JSC::JSLockHolder lock(exec);
JSType type = JSValueGetType(context, toRef(exec, value));
switch (type) {
@@ -910,6 +911,7 @@
JSC::ExecState* exec = root->globalObject()->globalExec();
JSGlobalContextRef ctx = toGlobalRef(exec);
+ JSC::JSLockHolder lock(exec);
WTF::Vector<JSValueRef> argListRef(args.size());
for (unsigned i = 0; i < args.size(); ++i)
argListRef[i] = BlackBerryJavaScriptVariantToJSValueRef(ctx, args[i]);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (132652 => 132653)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-10-26 14:26:09 UTC (rev 132652)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-10-26 14:30:12 UTC (rev 132653)
@@ -1,3 +1,21 @@
+2012-10-26 Sean Wang <[email protected]>
+
+ [BlackBerry] ASSERT currentThreadIsHoldingLock() failed in MarkedAllocator::allocateSlowCase()
+ https://bugs.webkit.org/show_bug.cgi?id=100504
+
+ Reviewed by Yong Li.
+
+ PR #232038 The similar PR # 200724.
+ Reviewed internally by Petter Wang.
+
+ This issue is same as bug 95492, and this patch is same as its patch.
+ Hold the JSLock for the current thread before we call toRef to avoid
+ the ASSERT failure.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::executeJavaScriptInIsolatedWorld):
+ (BlackBerry::WebKit::WebPage::executeJavaScriptFunction):
+
2012-10-25 Sean Wang <[email protected]>
[BlackBerry] WebView process crashed at AuthenticationChallengeManager::pageVisibilityChanged()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
