Diff
Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207597 => 207598)
--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-20 09:59:27 UTC (rev 207598)
@@ -1,5 +1,21 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r205326. rdar://problem/28476952
+
+ 2016-09-01 Ricky Mondello <rmonde...@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.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r205271. rdar://problem/28476952
2016-08-31 Ricky Mondello <rmonde...@apple.com>
Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt (207597 => 207598)
--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-10-20 09:59:27 UTC (rev 207598)
@@ -1,8 +1,8 @@
-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
+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
Test transforming youtube flash plugin to youtube iFrame based player. < rdar://problem/11201356>
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt (207597 => 207598)
--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-10-20 09:59:27 UTC (rev 207598)
@@ -1,9 +1,9 @@
-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
+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
Test embed youtube plugin without height or width attribute. < rdar://problem/12134474>
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt (207597 => 207598)
--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2016-10-20 09:59:27 UTC (rev 207598)
@@ -1,2 +1,2 @@
-Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc?showinfo=0
+Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207597 => 207598)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 09:59:27 UTC (rev 207598)
@@ -1,5 +1,20 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r205326. rdar://problem/28476952
+
+ 2016-09-01 Ricky Mondello <rmonde...@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.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r205306. rdar://problem/28476952
2016-09-01 Ricky Mondello <rmonde...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp (207597 => 207598)
--- branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-10-20 09:59:27 UTC (rev 207598)
@@ -327,13 +327,6 @@
if (query.isEmpty())
query = possibleMalformedQuery;
- // 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";
-
// Append the query string if it is valid.
StringBuilder finalURL;
if (isYouTubeShortenedURL)
Modified: branches/safari-602-branch/Tools/ChangeLog (207597 => 207598)
--- branches/safari-602-branch/Tools/ChangeLog 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-10-20 09:59:27 UTC (rev 207598)
@@ -1,5 +1,20 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r205326. rdar://problem/28476952
+
+ 2016-09-01 Ricky Mondello <rmonde...@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.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r205306. rdar://problem/28476952
2016-09-01 Ricky Mondello <rmonde...@apple.com>
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp (207597 => 207598)
--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp 2016-10-20 09:59:22 UTC (rev 207597)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp 2016-10-20 09:59:27 UTC (rev 207598)
@@ -52,18 +52,18 @@
EXPECT_TRUE(test("https://www.youtube.com", "https://www.youtube.com"));
// Basic YouTube video links, expected to be transformed.
- 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"));
+ 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"));
// With start time, preserved.
- 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"));
+ 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"));
// With an invalid query (see & instead of ?), we preserve and fix the query.
- 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"));
+ 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"));
// Non-Flash URL is untouched.
EXPECT_TRUE(test("https://www.youtube.com/embed/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ"));
