Changeset 205326 in webkit


Ignore:
Timestamp:
Sep 1, 2016 4:04:23 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

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 <Ricky Mondello> 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.
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r205319 r205326  
     12016-09-01  Ricky Mondello  <rmondello@apple.com>
     2
     3        YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
     4        https://bugs.webkit.org/show_bug.cgi?id=161478
     5        <rdar://problem/28050847>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt: Update the URL that was blocked.
     10        * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt: Ditto.
     11        * security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt: Ditto.
     12
    1132016-09-01  Devin Rousso  <dcrousso+webkit@gmail.com>
    214
  • trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt

    r203526 r205326  
    1 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
    2 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
    3 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
    4 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
    5 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
     1Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
     2Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
     3Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
     4Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
     5Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
    66Test transforming youtube flash plugin to youtube iFrame based player. < rdar://problem/11201356>
    77
  • trunk/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt

    r203522 r205326  
    1 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
    2 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
    3 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?showinfo=0
    4 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
    5 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
    6 Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US&showinfo=0
     1Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
     2Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
     3Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o
     4Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
     5Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
     6Blocked access to external URL http://www.youtube.com/embed/N0gb9v4LI4o?version=3&hl=en_US
    77Test embed youtube plugin without height or width attribute. < rdar://problem/12134474>
    88
  • trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt

    r203611 r205326  
    1 Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc?showinfo=0
     1Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc
    22
  • trunk/Source/WebCore/ChangeLog

    r205324 r205326  
     12016-09-01  Ricky Mondello  <rmondello@apple.com>
     2
     3        YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
     4        https://bugs.webkit.org/show_bug.cgi?id=161478
     5        <rdar://problem/28050847>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * Modules/plugins/YouTubePluginReplacement.cpp:
     10        (WebCore::YouTubePluginReplacement::youTubeURLFromAbsoluteURL): Stop adding the query parameter.
     11
    1122016-09-01  Mark Lam  <mark.lam@apple.com>
    213
  • trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp

    r205306 r205326  
    328328        query = possibleMalformedQuery;
    329329
    330     // By default, the iframe will display information like the video title and uploader on top of the video. Don't display
    331     // them if the embeding html doesn't specify it.
    332     if (!query.isEmpty() && !query.contains("showinfo"))
    333         query.append("&showinfo=0");
    334     else
    335         query = "showinfo=0";
    336    
    337330    // Append the query string if it is valid.
    338331    StringBuilder finalURL;
  • trunk/Tools/ChangeLog

    r205313 r205326  
     12016-09-01  Ricky Mondello  <rmondello@apple.com>
     2
     3        YouTube Flash plug-in replacement facility should not insert showinfo=0 into iframe URLs
     4        https://bugs.webkit.org/show_bug.cgi?id=161478
     5        <rdar://problem/28050847>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp:
     10        (TestWebKitAPI::TEST_F): Update expected results.
     11
    1122016-09-01  Anders Carlsson  <andersca@apple.com>
    213
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp

    r205306 r205326  
    5353
    5454    // Basic YouTube video links, expected to be transformed.
    55     EXPECT_TRUE(test("https://www.youtube.com/v/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
    56     EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ", "http://www.youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
    57     EXPECT_TRUE(test("https://youtube.com/v/dQw4w9WgXcQ", "https://youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
    58     EXPECT_TRUE(test("http://youtube.com/v/dQw4w9WgXcQ", "http://youtube.com/embed/dQw4w9WgXcQ?showinfo=0"));
     55    EXPECT_TRUE(test("https://www.youtube.com/v/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ"));
     56    EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ", "http://www.youtube.com/embed/dQw4w9WgXcQ"));
     57    EXPECT_TRUE(test("https://youtube.com/v/dQw4w9WgXcQ", "https://youtube.com/embed/dQw4w9WgXcQ"));
     58    EXPECT_TRUE(test("http://youtube.com/v/dQw4w9WgXcQ", "http://youtube.com/embed/dQw4w9WgXcQ"));
    5959
    6060    // With start time, preserved.
    61     EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&showinfo=0"));
    62     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"));
     61    EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
     62    EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1"));
    6363
    6464    // With an invalid query (see & instead of ?), we preserve and fix the query.
    65     EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&showinfo=0"));
    66     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"));
     65    EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
     66    EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1"));
    6767
    6868    // Non-Flash URL is untouched.
Note: See TracChangeset for help on using the changeset viewer.