Title: [167676] trunk/Source/WebCore
- Revision
- 167676
- Author
- mark....@apple.com
- Date
- 2014-04-22 12:58:24 -0700 (Tue, 22 Apr 2014)
Log Message
WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript() needs to acquire the JSLock before calling into JS.
<https://webkit.org/b/132021>
Reviewed by Mark Hahnenberg.
Covered by existing layout test.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167675 => 167676)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 19:48:29 UTC (rev 167675)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 19:58:24 UTC (rev 167676)
@@ -1,3 +1,15 @@
+2014-04-22 Mark Lam <mark....@apple.com>
+
+ WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript() needs to acquire the JSLock before calling into JS.
+ <https://webkit.org/b/132021>
+
+ Reviewed by Mark Hahnenberg.
+
+ Covered by existing layout test.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+
2014-04-22 Manuel Rego Casasnovas <r...@igalia.com>
REGRESSION (r167652): Broke fast/regions/cssom/region-range-for-box-crash.html in debug mode
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (167675 => 167676)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-22 19:48:29 UTC (rev 167675)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-22 19:58:24 UTC (rev 167676)
@@ -5935,6 +5935,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 functionValue = globalObject->get(exec, JSC::Identifier(exec, "createControls"));
if (functionValue.isFunction())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
