<!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>[205326] 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/205326">205326</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-01 16:04:23 -0700 (Thu, 01 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
https://bugs.webkit.org/show_bug.cgi?id=161478
<rdar://problem/28050847>
Patch by Ricky Mondello <rmondello@apple.com> on 2016-09-01
Reviewed by Eric Carlson.
Source/WebCore:
* Modules/plugins/YouTubePluginReplacement.cpp:
(WebCore::YouTubePluginReplacement::youTubeURLFromAbsoluteURL): Stop adding the query parameter.
Tools:
* TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp:
(TestWebKitAPI::TEST_F): Update expected results.
LayoutTests:
* platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt: Update the URL that was blocked.
* platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt: Ditto.
* security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframeexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementexpectedtxt">trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsYouTubePluginReplacementcpp">trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreYouTubePluginReplacementcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/LayoutTests/ChangeLog 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-01 Ricky Mondello <rmondello@apple.com>
+
+ YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
+ https://bugs.webkit.org/show_bug.cgi?id=161478
+ <rdar://problem/28050847>
+
+ Reviewed by Eric Carlson.
+
+ * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt: Update the URL that was blocked.
+ * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt: Ditto.
+ * security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt: Ditto.
+
</ins><span class="cx"> 2016-09-01 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add Object.awaitEvent which is like singleFireEventListener but returns a promise
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
</del><ins>+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
</ins><span class="cx"> Test transforming youtube flash plugin to youtube iFrame based player. < rdar://problem/11201356>
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
-Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
</del><ins>+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
+Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
</ins><span class="cx"> Test embed youtube plugin without height or width attribute. < rdar://problem/12134474>
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><del>-Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc?showinfo=0
</del><ins>+Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/Source/WebCore/ChangeLog 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-01 Ricky Mondello <rmondello@apple.com>
+
+ YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
+ https://bugs.webkit.org/show_bug.cgi?id=161478
+ <rdar://problem/28050847>
+
+ Reviewed by Eric Carlson.
+
+ * Modules/plugins/YouTubePluginReplacement.cpp:
+ (WebCore::YouTubePluginReplacement::youTubeURLFromAbsoluteURL): Stop adding the query parameter.
+
</ins><span class="cx"> 2016-09-01 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Move some JSObject and JSArray inline functions to their respective Inlines.h files.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsYouTubePluginReplacementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -327,13 +327,6 @@
</span><span class="cx"> if (query.isEmpty())
</span><span class="cx"> query = possibleMalformedQuery;
</span><span class="cx">
</span><del>- // By default, the iframe will display information like the video title and uploader on top of the video. Don't display
- // them if the embeding html doesn't specify it.
- if (!query.isEmpty() && !query.contains("showinfo"))
- query.append("&showinfo=0");
- else
- query = "showinfo=0";
-
</del><span class="cx"> // Append the query string if it is valid.
</span><span class="cx"> StringBuilder finalURL;
</span><span class="cx"> if (isYouTubeShortenedURL)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/Tools/ChangeLog 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-01 Ricky Mondello <rmondello@apple.com>
+
+ YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
+ https://bugs.webkit.org/show_bug.cgi?id=161478
+ <rdar://problem/28050847>
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp:
+ (TestWebKitAPI::TEST_F): Update expected results.
+
</ins><span class="cx"> 2016-09-01 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> add BlockPtr::fromCallable
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreYouTubePluginReplacementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp (205325 => 205326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp 2016-09-01 22:45:52 UTC (rev 205325)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp 2016-09-01 23:04:23 UTC (rev 205326)
</span><span class="lines">@@ -52,18 +52,18 @@
</span><span class="cx"> EXPECT_TRUE(test("https://www.youtube.com", "https://www.youtube.com"));
</span><span class="cx">
</span><span class="cx"> // Basic YouTube video links, expected to be transformed.
</span><del>- EXPECT_TRUE(test("https://www.youtube.com/v/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ", "http://www.youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
- EXPECT_TRUE(test("https://youtube.com/v/dQw4w9WgXcQ", "https://youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
- EXPECT_TRUE(test("http://youtube.com/v/dQw4w9WgXcQ", "http://youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
</del><ins>+ EXPECT_TRUE(test("https://www.youtube.com/v/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ"));
+ EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ", "http://www.youtube.com/embed/dQw4w9WgXcQ"));
+ EXPECT_TRUE(test("https://youtube.com/v/dQw4w9WgXcQ", "https://youtube.com/embed/dQw4w9WgXcQ"));
+ EXPECT_TRUE(test("http://youtube.com/v/dQw4w9WgXcQ", "http://youtube.com/embed/dQw4w9WgXcQ"));
</ins><span class="cx">
</span><span class="cx"> // With start time, preserved.
</span><del>- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&showinfo=0"));
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1&showinfo=0"));
</del><ins>+ EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
+ EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1"));
</ins><span class="cx">
</span><span class="cx"> // With an invalid query (see & instead of ?), we preserve and fix the query.
</span><del>- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&showinfo=0"));
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1&showinfo=0"));
</del><ins>+ EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
+ EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1"));
</ins><span class="cx">
</span><span class="cx"> // Non-Flash URL is untouched.
</span><span class="cx"> EXPECT_TRUE(test("https://www.youtube.com/embed/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ"));
</span></span></pre>
</div>
</div>
</body>
</html>