Title: [171731] branches/safari-600.1-branch/Source/WebCore
- Revision
- 171731
- Author
- [email protected]
- Date
- 2014-07-29 01:34:42 -0700 (Tue, 29 Jul 2014)
Log Message
Merged r171703. <rdar://problem/17833422>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171730 => 171731)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-29 08:32:17 UTC (rev 171730)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-29 08:34:42 UTC (rev 171731)
@@ -1,5 +1,20 @@
2014-07-29 Lucas Forschler <[email protected]>
+ Merge r171703
+
+ 2014-07-28 Mark Hahnenberg <[email protected]>
+
+ 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-29 Lucas Forschler <[email protected]>
+
Merge r171702
2014-07-28 Antti Koivisto <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (171730 => 171731)
--- branches/safari-600.1-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2014-07-29 08:32:17 UTC (rev 171730)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2014-07-29 08:34:42 UTC (rev 171731)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
