Title: [171703] trunk/Source/WebCore
Revision
171703
Author
mhahnenb...@apple.com
Date
2014-07-28 15:19:11 -0700 (Mon, 28 Jul 2014)

Log Message

ASSERTION FAILED: m_heap->vm()->currentThreadIsHoldingAPILock()
https://bugs.webkit.org/show_bug.cgi?id=135352

Reviewed by Oliver Hunt.

* Modules/plugins/QuickTimePluginReplacement.mm:
(WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected): This should be taking a
JSLock like its sibling methods do (e.g. installReplacement).

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (171702 => 171703)


--- trunk/Source/WebCore/ChangeLog	2014-07-28 22:18:12 UTC (rev 171702)
+++ trunk/Source/WebCore/ChangeLog	2014-07-28 22:19:11 UTC (rev 171703)
@@ -1,3 +1,14 @@
+2014-07-28  Mark Hahnenberg  <mhahnenb...@apple.com>
+
+        ASSERTION FAILED: m_heap->vm()->currentThreadIsHoldingAPILock()
+        https://bugs.webkit.org/show_bug.cgi?id=135352
+
+        Reviewed by Oliver Hunt.
+
+        * Modules/plugins/QuickTimePluginReplacement.mm:
+        (WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected): This should be taking a 
+        JSLock like its sibling methods do (e.g. installReplacement).
+
 2014-07-28  Antti Koivisto  <an...@apple.com>
 
         <embed> videos flashes constantly while playing inline on iPad, making it unwatchable

Modified: trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (171702 => 171703)


--- trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm	2014-07-28 22:18:12 UTC (rev 171702)
+++ trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm	2014-07-28 22:19:11 UTC (rev 171703)
@@ -159,6 +159,7 @@
     ScriptController& scriptController = page->mainFrame().script();
     JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
     JSC::ExecState* exec = globalObject->globalExec();
+    JSC::JSLockHolder lock(exec);
     
     JSC::JSValue replacementFunction = globalObject->get(exec, JSC::Identifier(exec, "createPluginReplacement"));
     if (replacementFunction.isFunction())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to