<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184329] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184329">184329</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-05-13 22:10:55 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get the ScriptController from the correct frame for media elements and plug-ins
https://bugs.webkit.org/show_bug.cgi?id=144983
rdar://problem/20692642&19943135
Reviewed by Sam Weinig.
HTMLMediaElement, QuickTimePluginReplacement and HTMLPlugInImageElement were
getting the main frame's ScriptController instead of the one for their frame.
This caused media controls JS to be running in the context of the main frame,
which broke media controls which use getCSSCanvasContext() and -webkit-canvas.
Fix by getting the frame via the element's document.
Also undo <a href="http://trac.webkit.org/projects/webkit/changeset/180584">r180584</a> which was working around this bug.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.drawTimelineBackground):
* Modules/plugins/QuickTimePluginReplacement.mm:
(WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected):
(WebCore::QuickTimePluginReplacement::installReplacement):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updateCaptionContainer):
(WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
(WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
(WebCore::HTMLMediaElement::pageScaleFactorChanged):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm">trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184328 => 184329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-14 04:19:18 UTC (rev 184328)
+++ trunk/Source/WebCore/ChangeLog 2015-05-14 05:10:55 UTC (rev 184329)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-05-13 Simon Fraser <simon.fraser@apple.com>
+
+ Get the ScriptController from the correct frame for media elements and plug-ins
+ https://bugs.webkit.org/show_bug.cgi?id=144983
+ rdar://problem/20692642&19943135
+
+ Reviewed by Sam Weinig.
+
+ HTMLMediaElement, QuickTimePluginReplacement and HTMLPlugInImageElement were
+ getting the main frame's ScriptController instead of the one for their frame.
+ This caused media controls JS to be running in the context of the main frame,
+ which broke media controls which use getCSSCanvasContext() and -webkit-canvas.
+
+ Fix by getting the frame via the element's document.
+
+ Also undo r180584 which was working around this bug.
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.drawTimelineBackground):
+ * Modules/plugins/QuickTimePluginReplacement.mm:
+ (WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected):
+ (WebCore::QuickTimePluginReplacement::installReplacement):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updateCaptionContainer):
+ (WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
+ (WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
+ (WebCore::HTMLMediaElement::pageScaleFactorChanged):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):
+
</ins><span class="cx"> 2015-05-13 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Fix trivial typos in ApplyBlockElementCommand
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (184328 => 184329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-14 04:19:18 UTC (rev 184328)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-14 05:10:55 UTC (rev 184329)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> buffered /= this.video.duration;
</span><span class="cx"> buffered = Math.max(buffered, played);
</span><span class="cx">
</span><del>- var ctx = this.video.ownerDocument.getCSSCanvasContext('2d', this.timelineContextName, width, height);
</del><ins>+ var ctx = document.getCSSCanvasContext('2d', this.timelineContextName, width, height);
</ins><span class="cx">
</span><span class="cx"> ctx.clearRect(0, 0, width, height);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (184328 => 184329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2015-05-14 04:19:18 UTC (rev 184328)
+++ trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2015-05-14 05:10:55 UTC (rev 184329)
</span><span class="lines">@@ -148,12 +148,11 @@
</span><span class="cx">
</span><span class="cx"> bool QuickTimePluginReplacement::ensureReplacementScriptInjected()
</span><span class="cx"> {
</span><del>- Page* page = m_parentElement->document().page();
- if (!page)
</del><ins>+ if (!m_parentElement->document().frame())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> DOMWrapperWorld& world = isolatedWorld();
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = m_parentElement->document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder lock(exec);
</span><span class="lines">@@ -174,13 +173,14 @@
</span><span class="cx">
</span><span class="cx"> bool QuickTimePluginReplacement::installReplacement(ShadowRoot* root)
</span><span class="cx"> {
</span><del>- Page* page = m_parentElement->document().page();
-
</del><span class="cx"> if (!ensureReplacementScriptInjected())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!m_parentElement->document().frame())
+ return false;
+
</ins><span class="cx"> DOMWrapperWorld& world = isolatedWorld();
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = m_parentElement->document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder lock(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (184328 => 184329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-14 04:19:18 UTC (rev 184328)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-14 05:10:55 UTC (rev 184329)
</span><span class="lines">@@ -3745,7 +3745,7 @@
</span><span class="cx"> if (!m_mediaControlsHost)
</span><span class="cx"> m_mediaControlsHost = MediaControlsHost::create(this);
</span><span class="cx">
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder lock(exec);
</span><span class="lines">@@ -5968,7 +5968,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> DOMWrapperWorld& world = ensureIsolatedWorld();
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder lock(exec);
</span><span class="lines">@@ -6011,7 +6011,7 @@
</span><span class="cx"> if (!ensureMediaControlsInjectedScript())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder lock(exec);
</span><span class="lines">@@ -6098,7 +6098,7 @@
</span><span class="cx">
</span><span class="cx"> LOG(Media, "HTMLMediaElement::pageScaleFactorChanged(%p) = %f", this, page->pageScaleFactor());
</span><span class="cx"> DOMWrapperWorld& world = ensureIsolatedWorld();
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSC::JSLockHolder lock(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (184328 => 184329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-05-14 04:19:18 UTC (rev 184328)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-05-14 05:10:55 UTC (rev 184329)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> DOMWrapperWorld& isolatedWorld = plugInImageElementIsolatedWorld();
</span><span class="cx"> document().ensurePlugInsInjectedScript(isolatedWorld);
</span><span class="cx">
</span><del>- ScriptController& scriptController = page->mainFrame().script();
</del><ins>+ ScriptController& scriptController = document().frame()->script();
</ins><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(isolatedWorld));
</span><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>