Title: [171769] branches/safari-600.1.4-branch/Source/WebCore
- Revision
- 171769
- Author
- matthew_han...@apple.com
- Date
- 2014-07-29 15:38:58 -0700 (Tue, 29 Jul 2014)
Log Message
Rollout r171703. <rdar://problem/17833422>
Modified Paths
Diff
Modified: branches/safari-600.1.4-branch/Source/WebCore/ChangeLog (171768 => 171769)
--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-07-29 22:35:20 UTC (rev 171768)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-07-29 22:38:58 UTC (rev 171769)
@@ -1,5 +1,24 @@
2014-07-29 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r171703. <rdar://problem/17833422>
+
+ 2014-07-29 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r171703. <rdar://problem/17833422>
+
+ 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-29 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r171708. <rdar://problem/17844894>
2014-07-29 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-600.1.4-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (171768 => 171769)
--- branches/safari-600.1.4-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2014-07-29 22:35:20 UTC (rev 171768)
+++ branches/safari-600.1.4-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2014-07-29 22:38:58 UTC (rev 171769)
@@ -159,7 +159,6 @@
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
