<!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>[160640] trunk</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/160640">160640</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 08:04:50 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix QuickTime plug-in replacement scripting bugs
https://bugs.webkit.org/show_bug.cgi?id=125717
Reviewed by Sam Weinig.
Source/WebCore:
No new tests, existing test updated.
* Modules/plugins/QuickTimePluginReplacement.js:
(Replacement): Change '' to "" to avoid "Empty character constant" warning when creating
Derived Sources.
(Replacement.prototype.createVideoElement): Handle qtsrc attribute. Remember base url.
(Replacement.prototype.setURL): Resolve urls relative to base.
LayoutTests:
* plugins/quicktime-plugin-replacement-expected.txt:
* plugins/quicktime-plugin-replacement.html: Update to test 'qtsrc' attribute, and to check
that relative urls are resolved correctly.
* plugins/resources/yellow.mov: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestspluginsquicktimepluginreplacementexpectedtxt">trunk/LayoutTests/plugins/quicktime-plugin-replacement-expected.txt</a></li>
<li><a href="#trunkLayoutTestspluginsquicktimepluginreplacementhtml">trunk/LayoutTests/plugins/quicktime-plugin-replacement.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsQuickTimePluginReplacementjs">trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestspluginsresourcesyellowmov">trunk/LayoutTests/plugins/resources/yellow.mov</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160639 => 160640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-12-16 16:00:42 UTC (rev 160639)
+++ trunk/LayoutTests/ChangeLog        2013-12-16 16:04:50 UTC (rev 160640)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-16 Eric Carlson <eric.carlson@apple.com>
+
+ Fix QuickTime plug-in replacement scripting bugs
+ https://bugs.webkit.org/show_bug.cgi?id=125717
+
+ Reviewed by Sam Weinig.
+
+ * plugins/quicktime-plugin-replacement-expected.txt:
+ * plugins/quicktime-plugin-replacement.html: Update to test 'qtsrc' attribute, and to check
+ that relative urls are resolved correctly.
+ * plugins/resources/yellow.mov: Added.
+
</ins><span class="cx"> 2013-12-16 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Expose accessibility objects with ATK_ROLE_CHECK_MENU_ITEM
</span></span></pre></div>
<a id="trunkLayoutTestspluginsquicktimepluginreplacementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/quicktime-plugin-replacement-expected.txt (160639 => 160640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/quicktime-plugin-replacement-expected.txt        2013-12-16 16:00:42 UTC (rev 160639)
+++ trunk/LayoutTests/plugins/quicktime-plugin-replacement-expected.txt        2013-12-16 16:04:50 UTC (rev 160640)
</span><span class="lines">@@ -1,4 +1,6 @@
</span><span class="cx">
</span><ins>+
+** Test 'qtsrc'. src = yellow.mov qtsrc = orange.mov, qtsrc should load.
</ins><span class="cx"> EVENT(qt_begin)
</span><span class="cx"> EVENT(qt_validated)
</span><span class="cx"> EVENT(qt_canplay)
</span><span class="lines">@@ -33,7 +35,7 @@
</span><span class="cx"> PASS embed.GetErrorLog is a function.
</span><span class="cx">
</span><span class="cx"> ** Test overridden methods.
</span><del>-PASS embed.GetURL().indexOf('resources/orange.mov') != -1 is true
</del><ins>+PASS embed.GetURL().indexOf('orange.mov') != -1 is true
</ins><span class="cx"> PASS embed.GetDuration() is 300000
</span><span class="cx"> PASS embed.GetMovieSize() is 24962
</span><span class="cx"> PASS embed.GetMaxTimeLoaded() is 300000
</span><span class="lines">@@ -53,6 +55,15 @@
</span><span class="cx"> EVENT(qt_pause)
</span><span class="cx"> PASS embed.GetRate() is 0
</span><span class="cx">
</span><ins>+** SetURL expects a url relative to the original src, not to the document.
+embed.SetURL('yellow.mov')
+EVENT(qt_begin)
+EVENT(qt_validated)
+EVENT(qt_canplay)
+EVENT(qt_canplaythrough)
+PASS embed.GetURL().indexOf('yellow.mov') != -1 is true
+
+** SetURL to an empty string should generate an error.
</ins><span class="cx"> embed.SetURL('')
</span><span class="cx"> EVENT(qt_begin)
</span><span class="cx"> EVENT(qt_error)
</span></span></pre></div>
<a id="trunkLayoutTestspluginsquicktimepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/quicktime-plugin-replacement.html (160639 => 160640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/quicktime-plugin-replacement.html        2013-12-16 16:00:42 UTC (rev 160639)
+++ trunk/LayoutTests/plugins/quicktime-plugin-replacement.html        2013-12-16 16:04:50 UTC (rev 160640)
</span><span class="lines">@@ -4,7 +4,8 @@
</span><span class="cx"> <script src="../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> var embed;
</span><del>- var src = "resources/orange.mov";
</del><ins>+ var orangeURL = "orange.mov";
+ var yellowURL = "yellow.mov";
</ins><span class="cx">
</span><span class="cx"> function logEvent(event)
</span><span class="cx"> {
</span><span class="lines">@@ -20,22 +21,34 @@
</span><span class="cx">
</span><span class="cx"> function playing(event)
</span><span class="cx"> {
</span><ins>+ embed.removeEventListener("qt_play", playing, true);
</ins><span class="cx"> debug("");
</span><span class="cx"> logEvent(event);
</span><span class="cx"> shouldEvaluateTo("embed.GetRate()", 1);
</span><span class="cx"> evalAndLog("embed.Stop()");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function clearURL(event)
+ {
+ logEvent(event)
+
+ shouldBeTrue("embed.GetURL().indexOf('" + yellowURL + "') != -1");
+
+ debug("<br>** SetURL to an empty string should generate an error.");
+ evalAndLog("embed.SetURL('')");
+ }
+
</ins><span class="cx"> function paused(event)
</span><span class="cx"> {
</span><span class="cx"> debug("");
</span><span class="cx"> logEvent(event)
</span><span class="cx"> shouldEvaluateTo("embed.GetRate()", 0);
</span><span class="cx">
</span><del>- debug("");
- evalAndLog("embed.SetURL('')");
</del><ins>+ debug("<br>** SetURL expects a url relative to the original src, not to the document.");
+ embed.addEventListener("qt_canplaythrough", clearURL, true);
+ evalAndLog("embed.SetURL('" + yellowURL + "')");
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function error(event)
</span><span class="cx"> {
</span><span class="cx"> logEvent(event)
</span><span class="lines">@@ -45,9 +58,10 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }
</span><del>-
- function test(event)
</del><ins>+
+ function testElement(event)
</ins><span class="cx"> {
</span><ins>+ embed.removeEventListener("qt_canplaythrough", testElement, true);
</ins><span class="cx"> logEvent(event)
</span><span class="cx">
</span><span class="cx"> if (window.internals) {
</span><span class="lines">@@ -76,14 +90,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> debug("<br>** Test overridden methods.");
</span><del>- shouldBeTrue("embed.GetURL().indexOf('" + src + "') != -1");
</del><ins>+ shouldBeTrue("embed.GetURL().indexOf('" + orangeURL + "') != -1");
</ins><span class="cx"> shouldEvaluateTo("embed.GetDuration()", 300000);
</span><span class="cx"> shouldEvaluateTo("embed.GetMovieSize()", 24962);
</span><span class="cx"> shouldEvaluateTo("embed.GetMaxTimeLoaded()", 300000);
</span><span class="cx"> shouldEvaluateTo("embed.GetMaxBytesLoaded()", 24962);
</span><span class="cx"> shouldEvaluateTo("embed.GetMovieSize()", 24962);
</span><span class="cx"> shouldBeEqualToString("embed.GetPluginStatus()", "Playable");
</span><del>-
</del><ins>+
</ins><span class="cx"> // "GetDate()" should return the current date, clear seconds and milliseconds
</span><span class="cx"> var now = new Date();
</span><span class="cx"> shouldBeCloseTo("new Date(embed.GetDate()) - new Date()", 0, 100);
</span><span class="lines">@@ -99,8 +113,11 @@
</span><span class="cx"> window.testRunner.dumpAsText()
</span><span class="cx"> window.internals.settings.setPluginReplacementEnabled(true);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div = document.getElementById("parent");
</span><del>- div.innerHTML = '<embed src="' + src + '" width="640" height="480" postdomevents=true>';
</del><ins>+
+ debug("<br>** Test 'qtsrc'. src = " + yellowURL + " qtsrc = " + orangeURL + ", qtsrc should load.");
+ div.innerHTML = '<embed src="resources/' + yellowURL + '" qtsrc="' + orangeURL + '" width="640" height="480" postdomevents=true>';
</ins><span class="cx">
</span><span class="cx"> var events = [ "qt_begin", "qt_validated", "qt_enterfullscreen", "qt_exitfullscreen",
</span><span class="cx"> "qt_loadedmetada", "qt_canplay", "qt_ended", "qt_timedmetadataupdated"
</span><span class="lines">@@ -108,7 +125,7 @@
</span><span class="cx"> embed = div.firstChild;
</span><span class="cx"> for (i = 0; i < events.length; ++i)
</span><span class="cx"> embed.addEventListener(events[i], logEvent, true);
</span><del>- embed.addEventListener("qt_canplaythrough", test, true);
</del><ins>+ embed.addEventListener("qt_canplaythrough", testElement, true);
</ins><span class="cx"> embed.addEventListener("qt_play", playing, true);
</span><span class="cx"> embed.addEventListener("qt_pause", paused, true);
</span><span class="cx"> embed.addEventListener("qt_error", error, true);
</span></span></pre></div>
<a id="trunkLayoutTestspluginsresourcesyellowmov"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/plugins/resources/yellow.mov (0 => 160640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/resources/yellow.mov         (rev 0)
+++ trunk/LayoutTests/plugins/resources/yellow.mov        2013-12-16 16:04:50 UTC (rev 160640)
</span><span class="lines">@@ -0,0 +1,1022 @@
</span><ins>+ ftypqt qt