Changeset 182428 in webkit


Ignore:
Timestamp:
Apr 6, 2015 9:28:52 AM (9 years ago)
Author:
ap@apple.com
Message:

Reduce the dependency on Flash in regression tests
https://bugs.webkit.org/show_bug.cgi?id=143391

Reviewed by Anders Carlsson.

Tools:

  • WebKitTestRunner/TestController.cpp: (WTR::TestController::decidePolicyForPluginLoad):

Only allow QuickTime and the test plug-in.

LayoutTests:

  • accessibility/inline-block-assertion.html:
  • accessibility/plugin.html:
  • compositing/geometry/empty-embed-rects.html:
  • fast/history/resources/subframe-with-plugin.html:
  • fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html:
  • fast/loader/loadInProgress.html:
  • fast/replaced/border-radius-clip.html:
  • fast/replaced/embed-display-none.html:
  • plugins/crash-restoring-plugin-page-from-page-cache.html:
  • plugins/object-embed-plugin-scripting.html:
  • plugins/resources/plugin-frame.html:

Use TestNetscapePlugin, as the tests don't appear to have any real need for Flash.

  • plugins/iframe-shims.html: Removed. This was a test for a chromium only feature

that never existed in WebKit.

  • platform/mac/TestExpectations:
  • platform/wincairo/TestExpectations:

Removed the deleted plugins/iframe-shims.html.

  • platform/mac-wk2/TestExpectations: Skip snapshotting tests that use Flash,

because they make WebKitTestRunner crash now. Marked all other snapshotting tests
as Pass/Failure, because they don't really make any sense, and are only useful for
finsing crashes.

  • platform/wk2/TestExpectations: Skipped a few remaining tests that use Flash.

These tests still run (and pass) under WebKit1, regardless of whether Flash is
installed, so they don't seem like very accurate tests.

Location:
trunk
Files:
1 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r182424 r182428  
     12015-04-03  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce the dependency on Flash in regression tests
     4        https://bugs.webkit.org/show_bug.cgi?id=143391
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * accessibility/inline-block-assertion.html:
     9        * accessibility/plugin.html:
     10        * compositing/geometry/empty-embed-rects.html:
     11        * fast/history/resources/subframe-with-plugin.html:
     12        * fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html:
     13        * fast/loader/loadInProgress.html:
     14        * fast/replaced/border-radius-clip.html:
     15        * fast/replaced/embed-display-none.html:
     16        * plugins/crash-restoring-plugin-page-from-page-cache.html:
     17        * plugins/object-embed-plugin-scripting.html:
     18        * plugins/resources/plugin-frame.html:
     19        Use TestNetscapePlugin, as the tests don't appear to have any real need for Flash.
     20
     21        * plugins/iframe-shims.html: Removed. This was a test for a chromium only feature
     22        that never existed in WebKit.
     23
     24        * platform/mac/TestExpectations:
     25        * platform/wincairo/TestExpectations:
     26        Removed the deleted plugins/iframe-shims.html.
     27
     28        * platform/mac-wk2/TestExpectations: Skip snapshotting tests that use Flash,
     29        because they make WebKitTestRunner crash now. Marked all other snapshotting tests
     30        as Pass/Failure, because they don't really make any sense, and are only useful for
     31        finsing crashes.
     32
     33        * platform/wk2/TestExpectations: Skipped a few remaining tests that use Flash.
     34        These tests still run (and pass) under WebKit1, regardless of whether Flash is
     35        installed, so they don't seem like very accurate tests.
     36
    1372015-04-06  Brent Fulgham  <bfulgham@apple.com>
    238
  • trunk/LayoutTests/accessibility/inline-block-assertion.html

    r176321 r182428  
    66<body id="body">
    77
    8 <embed src="../resources/test.swf" type="application/x-shockwave-flash" allowfullscreen="true" width="362" height="298" data-original-width="425" data-original-height="350">
     8<embed>
    99<div pseudo="-webkit-plugin-replacement" style="display: inline-block; position: relative; width: 100; height: 100;" id="group">
    1010<iframe width="100%" id="iframe" style="max-height: 100%" height="350" src="resources/cake.png" frameborder="0" scrolling="no"></iframe>
  • trunk/LayoutTests/accessibility/plugin.html

    r157780 r182428  
    88    <object width=100 height=100>
    99       <param name="movie">
    10        <embed src="../resources/test.swf" type="application/x-shockwave-flash">
     10       <embed type="application/x-webkit-test-netscape">
    1111    </object>   
    1212   
  • trunk/LayoutTests/compositing/geometry/empty-embed-rects.html

    r119992 r182428  
    1111    <p>This testcase should not fire an assertion related to the clip rects root.</p>
    1212    <div style="position: absolute;">
    13         <embed type="application/x-shockwave-flash">
     13        <embed type="application/x-webkit-test-netscape">
    1414    </div>     
    1515    <div style="position: relative;">
    1616        <div style="position: absolute;"></div>
    17         <embed type="application/x-shockwave-flash">
     17        <embed type="application/x-webkit-test-netscape">
    1818    </div>
    1919</body>
  • trunk/LayoutTests/fast/history/resources/subframe-with-plugin.html

    r155361 r182428  
    22  <head></head>
    33  <body>
    4     <embed src="../../../plugins/resources/lines.swf"></embed>
     4    <embed type="application/x-webkit-test-netscape"></embed>
    55  </body>
    66</html>
  • trunk/LayoutTests/fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html

    r121012 r182428  
    2525    <object id="first" data="resources/mu.png" style="height: 100px; width:100px;"><embed height="300" width="300"></object>
    2626    <br>
    27     <object id="second" data="resources/mu.png" style="" width="100" height="100"><embed height="300" width="300" type="application/x-shockwave-flash" src="../../plugins/resources/simple_blank.swf"></object>
     27    <object id="second" data="resources/mu.png" style="" width="100" height="100"><embed height="300" width="300" type="application/x-webkit-test-netscape"></object>
    2828    <br>
    29     <object id="third" style="" width="100" height="100"><embed height="300" width="300" type="application/x-shockwave-flash" src="../../plugins/resources/simple_blank.swf"></object>
     29    <object id="third" style="" width="100" height="100"><embed height="300" width="300" type="application/x-webkit-test-netscape"></object>
    3030    <div id="console">FAILURE</div>
    3131</body></html>
  • trunk/LayoutTests/fast/loader/loadInProgress.html

    r122687 r182428  
    2121<body onLoad="testForm();">
    2222<form name="LoginForm">
    23 <embed src="" type="application/x-shockwave-flash"></embed>
     23<embed type="application/x-webkit-test-netscape"></embed>
    2424</form>                 
    2525</body>
  • trunk/LayoutTests/fast/replaced/border-radius-clip.html

    r157780 r182428  
    1919<br>
    2020
    21 <embed src="../../resources/test.swf" style="border:3px solid black; background-color: lime; -webkit-border-radius: 32px; margin-bottom:-32px"
     21<embed style="border:3px solid black; background-color: lime; -webkit-border-radius: 32px; margin-bottom:-32px"
    2222    quality="high" width="550" height="400" wmode="transparent"
    23     type="application/x-shockwave-flash"
    24     pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
     23    type="application/x-webkit-test-netscape">
    2524</embed>
  • trunk/LayoutTests/fast/replaced/embed-display-none.html

    r157780 r182428  
    44
    55  <p>Should not see the embed below (it has display:none).</p>
    6   <embed style="display:none" src="../../resources/test.swf"
     6  <embed style="display:none"
    77    quality="high" width="550" height="400"
    8     type="application/x-shockwave-flash"
    9     pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
     8    type="application/x-webkit-test-netscape">
    109  </embed>
    1110
  • trunk/LayoutTests/platform/mac-wk2/TestExpectations

    r182322 r182428  
    299299webkit.org/b/132766 fast/hidpi/filters-reference.html [ ImageOnlyFailure ]
    300300
     301# Plug-in snapshotting tests do not make much sense:
     302# - snapshotting is only supported for Flash, but we can't use Flash because it isn't installed everywhere;
     303# - so most of the tests use QuickTime, which doesn't support snapshotting, and is 32-bit only, thus failing to load in engineering builds.
     304plugins/snapshotting [ Pass Failure ]
     305# These two tests use Flash, so they trigger a release assertion.
     306plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html [ Skip ]
     307plugins/snapshotting/print-snapshotted-plugin.html [ Skip ]
     308
    301309webkit.org/b/133227 plugins/snapshotting/set-plugin-size-to-tiny.html [ Failure ]
    302310webkit.org/b/133227 plugins/snapshotting/quicktime-plugin-snapshotted.html [ Pass Failure ]
  • trunk/LayoutTests/platform/mac/TestExpectations

    r182281 r182428  
    180180# viewport meta tag support
    181181fast/viewport
    182 
    183 # The WebKit plugin implementation does not support iframe shims.
    184 webkit.org/b/46223 plugins/iframe-shims.html
    185182
    186183webkit.org/b/116640 plugins/plugin-initiate-popup-window.html
  • trunk/LayoutTests/platform/wincairo/TestExpectations

    r180871 r182428  
    17751775fast/parser/pre-html5-parser-quirks.html
    17761776
    1777 # https://bugs.webkit.org/show_bug.cgi?id=46223
    1778 # The WebKit plugin implementation does not support iframe shims.
    1779 plugins/iframe-shims.html
    1780 
    17811777# Requires WebP support.
    17821778fast/canvas/canvas-toDataURL-webp.html
  • trunk/LayoutTests/platform/wk2/TestExpectations

    r182316 r182428  
    281281http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level.html
    282282
    283 # These are plug-in tests that use Flash or QuickTime. We should convert these to use the test plug-in.
    284 plugins/iframe-shims.html
    285 plugins/embed-attributes-setting.html
     283# These tests use Flash, which is not a good idea, because it is not installed on all machines that run tests.
     284# WebKitTestRunner detects attempts to use Flash, and raises an assertion.
     285editing/pasteboard/paste-noplugin.html [ Skip ]
     286fast/dom/beforeload/flash-before-load.html [ Skip ]
     287fast/dom/beforeload/remove-flash-in-beforeload-listener.html [ Skip ]
     288fast/loader/sandboxed-plugin-crash.html [ Skip ]
     289plugins/hidden-iframe-with-swf-plugin.html [ Skip ]
     290plugins/plugin-document-load-prevented-userscript.html [ Skip ]
     291plugins/plugin-document-willSendRequest-null.html [ Skip ]
     292plugins/plugin-remove-readystatechange.html [ Skip ]
    286293
    287294# This test checks that NPN_GetURL with a blank target will return an error if the window isn't opened. This behavior doesn't
  • trunk/LayoutTests/plugins/crash-restoring-plugin-page-from-page-cache.html

    r120417 r182428  
    6464<object>
    6565
    66 <object type="application/x-shockwave-flash" width="500" height="375" id="ExamplePlugin">
     66<object type="application/x-webkit-test-netscape" width="500" height="375" id="ExamplePlugin">
    6767    <img src="resources/apple.gif">
    6868</object>
  • trunk/LayoutTests/plugins/object-embed-plugin-scripting.html

    r120417 r182428  
    3838    width = 0 height = 0
    3939    >
    40     <PARAM name="src" value="resources/simple_blank.swf">
    4140    <PARAM name="autostart" value="false">
    4241   
     
    104103    width = 0 height = 0
    105104    >
    106     <param name="src" value="resources/simple_blank.swf">
    107105    <param name="autostart" value="false">
    108106    <param name="enablejavascript" value="true">
  • trunk/LayoutTests/plugins/resources/plugin-frame.html

    r180441 r182428  
    2323<table>
    2424    <tr>
    25         <td><embed src="foo.swf" type="application/x-shockwave-flash"></td>
     25        <td><embed type="application/x-webkit-test-netscape"></td>
    2626    </tr>
    2727</table>
  • trunk/Tools/ChangeLog

    r182386 r182428  
     12015-04-03  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce the dependency on Flash in regression tests
     4        https://bugs.webkit.org/show_bug.cgi?id=143391
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebKitTestRunner/TestController.cpp: (WTR::TestController::decidePolicyForPluginLoad):
     9        Only allow QuickTime and the test plug-in.
     10
    1112015-04-06  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    212
  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r182260 r182428  
    4747#include <WebKit/WKPageInjectedBundleClient.h>
    4848#include <WebKit/WKPagePrivate.h>
     49#include <WebKit/WKPluginInformation.h>
    4950#include <WebKit/WKPreferencesRefPrivate.h>
    5051#include <WebKit/WKProtectionSpace.h>
     
    13151316    if (m_shouldBlockAllPlugins)
    13161317        return kWKPluginLoadPolicyBlocked;
     1318
     1319#if PLATFORM(MAC)
     1320    WKStringRef bundleIdentifier = (WKStringRef)WKDictionaryGetItemForKey(pluginInformation, WKPluginInformationBundleIdentifierKey());
     1321    if (!bundleIdentifier)
     1322        return currentPluginLoadPolicy;
     1323
     1324    if (WKStringIsEqualToUTF8CString(bundleIdentifier, "com.apple.QuickTime Plugin.plugin"))
     1325        return currentPluginLoadPolicy;
     1326
     1327    if (WKStringIsEqualToUTF8CString(bundleIdentifier, "com.apple.testnetscapeplugin"))
     1328        return currentPluginLoadPolicy;
     1329
     1330    RELEASE_ASSERT_NOT_REACHED(); // Please don't use any other plug-ins in tests, as they will not be installed on all machines.
     1331#else
    13171332    return currentPluginLoadPolicy;
     1333#endif
    13181334}
    13191335
Note: See TracChangeset for help on using the changeset viewer.