Changeset 155261 in webkit


Ignore:
Timestamp:
Sep 7, 2013 2:47:04 PM (11 years ago)
Author:
mark.lam@apple.com
Message:

Change fast/a* and fast/b* files to use pre and post js files in LayoutTests/resources.
​https://bugs.webkit.org/show_bug.cgi?id=120968.

Rubber stamped by Filip Pizlo.

  • fast/animation/request-animation-frame-cancel.html:
  • fast/animation/request-animation-frame-cancel2.html:
  • fast/animation/request-animation-frame-disabled.html:
  • fast/animation/request-animation-frame-during-modal.html:
  • fast/animation/request-animation-frame-iframe.html:
  • fast/animation/request-animation-frame-iframe2.html:
  • fast/animation/request-animation-frame-missing-arguments.html:
  • fast/animation/request-animation-frame-prefix.html:
  • fast/animation/request-animation-frame-time-unit.html:
  • fast/animation/request-animation-frame-timestamps-advance.html:
  • fast/animation/request-animation-frame-timestamps.html:
  • fast/animation/request-animation-frame-too-rapid.html:
  • fast/animation/request-animation-frame-within-callback.html:
  • fast/animation/request-animation-frame.html:
  • fast/animation/script-tests/TEMPLATE.html:
  • fast/animation/script-tests/request-animation-frame-subframe.html:
  • fast/backgrounds/background-position-parsing-2.html:
  • fast/backgrounds/background-shorthand-after-set-backgroundSize.html:
  • fast/backgrounds/background-shorthand-with-backgroundSize-style.html:
  • fast/backgrounds/multiple-backgrounds-computed-style.html:
  • fast/backgrounds/repeat/background-repeat-shorthand.html:
  • fast/backgrounds/repeat/margin-shorthand.html:
  • fast/backgrounds/repeat/parsing-background-repeat.html:
  • fast/backgrounds/repeat/script-tests/TEMPLATE.html:
  • fast/backgrounds/script-tests/TEMPLATE.html:
  • fast/backgrounds/size/parsing-background-size-values.html:
  • fast/backgrounds/size/parsing-inherit.html:
  • fast/block/block-parent-with-zero-width-child.html:
  • fast/block/block-with-inline-replaced-child-following-text.html:
  • fast/block/margin-collapse/webkit-margin-collapse-separate-position.html:
  • fast/block/positioning/hittest-on-relative-positioned-children.html:
  • fast/block/positioning/relayout-nested-positioned-elements-crash.html:
  • fast/borders/border-radius-child.html:
  • fast/borders/border-width-percent.html:
  • fast/box-decoration-break/box-decoration-break-parsing.html:
  • fast/box-shadow/box-shadow-parsing-invalid.html:
  • fast/box-sizing/css-table-with-box-sizing.html:
  • fast/box-sizing/table-cell.html:
Location:
trunk/LayoutTests
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r155259 r155261  
     12013-09-07  Mark Lam  <mark.lam@apple.com>
     2
     3        Change fast/a* and fast/b* files to use pre and post js files in LayoutTests/resources.
     4        https://bugs.webkit.org/show_bug.cgi?id=120968.
     5
     6        Rubber stamped by Filip Pizlo.
     7
     8        * fast/animation/request-animation-frame-cancel.html:
     9        * fast/animation/request-animation-frame-cancel2.html:
     10        * fast/animation/request-animation-frame-disabled.html:
     11        * fast/animation/request-animation-frame-during-modal.html:
     12        * fast/animation/request-animation-frame-iframe.html:
     13        * fast/animation/request-animation-frame-iframe2.html:
     14        * fast/animation/request-animation-frame-missing-arguments.html:
     15        * fast/animation/request-animation-frame-prefix.html:
     16        * fast/animation/request-animation-frame-time-unit.html:
     17        * fast/animation/request-animation-frame-timestamps-advance.html:
     18        * fast/animation/request-animation-frame-timestamps.html:
     19        * fast/animation/request-animation-frame-too-rapid.html:
     20        * fast/animation/request-animation-frame-within-callback.html:
     21        * fast/animation/request-animation-frame.html:
     22        * fast/animation/script-tests/TEMPLATE.html:
     23        * fast/animation/script-tests/request-animation-frame-subframe.html:
     24        * fast/backgrounds/background-position-parsing-2.html:
     25        * fast/backgrounds/background-shorthand-after-set-backgroundSize.html:
     26        * fast/backgrounds/background-shorthand-with-backgroundSize-style.html:
     27        * fast/backgrounds/multiple-backgrounds-computed-style.html:
     28        * fast/backgrounds/repeat/background-repeat-shorthand.html:
     29        * fast/backgrounds/repeat/margin-shorthand.html:
     30        * fast/backgrounds/repeat/parsing-background-repeat.html:
     31        * fast/backgrounds/repeat/script-tests/TEMPLATE.html:
     32        * fast/backgrounds/script-tests/TEMPLATE.html:
     33        * fast/backgrounds/size/parsing-background-size-values.html:
     34        * fast/backgrounds/size/parsing-inherit.html:
     35        * fast/block/block-parent-with-zero-width-child.html:
     36        * fast/block/block-with-inline-replaced-child-following-text.html:
     37        * fast/block/margin-collapse/webkit-margin-collapse-separate-position.html:
     38        * fast/block/positioning/hittest-on-relative-positioned-children.html:
     39        * fast/block/positioning/relayout-nested-positioned-elements-crash.html:
     40        * fast/borders/border-radius-child.html:
     41        * fast/borders/border-width-percent.html:
     42        * fast/box-decoration-break/box-decoration-break-parsing.html:
     43        * fast/box-shadow/box-shadow-parsing-invalid.html:
     44        * fast/box-sizing/css-table-with-box-sizing.html:
     45        * fast/box-sizing/table-cell.html:
     46
    1472013-09-07  Mark Lam  <mark.lam@apple.com>
    248

  • trunk/LayoutTests/fast/animation/request-animation-frame-cancel.html

    r98733 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-cancel2.html

    r98733 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-disabled.html

    r120681 r155261  
    66    window.testRunner.overridePreference("WebKitRequestAnimationFrameEnabled", "0");
    77</script>
    8 <script src="../js/resources/js-test-pre.js"></script>
     8<script src="../../resources/js-test-pre.js"></script>
    99</head>
    1010<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-during-modal.html

    r131214 r155261  
    11<!DOCTYPE html>
    22<html>
    3 <script src="../js/resources/js-test-pre.js"></script>
     3<script src="../../resources/js-test-pre.js"></script>
    44<body>
    55

  • trunk/LayoutTests/fast/animation/request-animation-frame-iframe.html

    r120681 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-iframe2.html

    r131214 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-missing-arguments.html

    r131214 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    … …  
    1010shouldThrow("cancelAnimationFrame()");
    1111</script>
    12 <script src="../js/resources/js-test-post.js"></script>
     12<script src="../../resources/js-test-post.js"></script>
    1313</body>
    1414</html>

  • trunk/LayoutTests/fast/animation/request-animation-frame-prefix.html

    r139509 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-time-unit.html

    r148022 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-timestamps-advance.html

    r97881 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    … …  
    88<span id="f"></span>
    99<script src="script-tests/request-animation-frame-timestamps-advance.js"></script>
    10 <script src="../js/resources/js-test-post.js"></script>
     10<script src="../../resources/js-test-post.js"></script>
    1111</body>
    1212</html>

  • trunk/LayoutTests/fast/animation/request-animation-frame-timestamps.html

    r98733 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-too-rapid.html

    r132742 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame-within-callback.html

    r98733 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/request-animation-frame.html

    r98733 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/animation/script-tests/TEMPLATE.html

    r97881 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    … …  
    88<span id="f"></span>
    99<script src="YOUR_JS_FILE_HERE"></script>
    10 <script src="../js/resources/js-test-post.js"></script>
     10<script src="../../resources/js-test-post.js"></script>
    1111</body>
    1212</html>

  • trunk/LayoutTests/fast/animation/script-tests/request-animation-frame-subframe.html

    r131214 r155261  
    22<html>
    33<head>
    4 <script src="../../js/resources/js-test-pre.js"></script>
     4<script src="../../../resources/js-test-pre.js"></script>
    55</head>
    66<body>

  • trunk/LayoutTests/fast/backgrounds/background-position-parsing-2.html

    r150972 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    … …  
    533533document.body.removeChild(testContainer);
    534534</script>
    535 <script src="../js/resources/js-test-post.js"></script>
     535<script src="../../resources/js-test-post.js"></script>
    536536</body>
    537537</html>

  • trunk/LayoutTests/fast/backgrounds/background-shorthand-after-set-backgroundSize.html

    r147034 r155261  
    11<!DOCTYPE html>
    22<html>
    3 <script src="../js/resources/js-test-pre.js"></script>
     3<script src="../../resources/js-test-pre.js"></script>
    44<div id="test"> </div>
    55<script>
    … …  
    2121
    2222</script>
    23 <script src="../js/resources/js-test-post.js"></script>
     23<script src="../../resources/js-test-post.js"></script>
    2424</body>
    2525</html>

  • trunk/LayoutTests/fast/backgrounds/background-shorthand-with-backgroundSize-style.html

    r119259 r155261  
    11<!DOCTYPE html>
    22<html>
    3 <script src="../js/resources/js-test-pre.js"></script>
     3<script src="../../resources/js-test-pre.js"></script>
    44<div id="test"> </div>
    55<script>
    … …  
    143143debug("")
    144144</script>
    145 <script src="../js/resources/js-test-post.js"></script>
     145<script src="../../resources/js-test-post.js"></script>
    146146</body>
    147147</html>

  • trunk/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style.html

    r97881 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    77<script src="script-tests/multiple-backgrounds-computed-style.js"></script>
    8 <script src="../js/resources/js-test-post.js"></script>
     8<script src="../../resources/js-test-post.js"></script>
    99</body>
    1010</html>

  • trunk/LayoutTests/fast/backgrounds/repeat/background-repeat-shorthand.html

    r97881 r155261  
    33<head>
    44<link rel="stylesheet" href="resources/background-repeat-shorthand.css">
    5 <script src="../../js/resources/js-test-pre.js"></script>
     5<script src="../../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    … …  
    99<div id="icon2"></div>
    1010<script src="resources/background-repeat-shorthand.js"></script>
    11 <script src="../../js/resources/js-test-post.js"></script>
     11<script src="../../../resources/js-test-post.js"></script>
    1212</body>
    1313</html>

  • trunk/LayoutTests/fast/backgrounds/repeat/margin-shorthand.html

    r97881 r155261  
    33<head>
    44<link rel="stylesheet" href="resources/margin-shorthand.css">
    5 <script src="../../js/resources/js-test-pre.js"></script>
     5<script src="../../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    88<div id="icon"></div>
    99<script src="resources/margin-shorthand.js"></script>
    10 <script src="../../js/resources/js-test-post.js"></script>
     10<script src="../../../resources/js-test-post.js"></script>
    1111</body>
    1212</html>

  • trunk/LayoutTests/fast/backgrounds/repeat/parsing-background-repeat.html

    r97881 r155261  
    22<html>
    33<head>
    4 <script src="../../js/resources/js-test-pre.js"></script>
     4<script src="../../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    77<script src="script-tests/parsing-background-repeat.js"></script>
    8 <script src="../../js/resources/js-test-post.js"></script>
     8<script src="../../../resources/js-test-post.js"></script>
    99</body>
    1010</html>

  • trunk/LayoutTests/fast/backgrounds/repeat/script-tests/TEMPLATE.html

    r97881 r155261  
    22<html>
    33<head>
    4 <script src="../../js/resources/js-test-pre.js"></script>
     4<script src="../../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    77<script src="YOUR_JS_FILE_HERE"></script>
    8 <script src="../../js/resources/js-test-post.js"></script>
     8<script src="../../../resources/js-test-post.js"></script>
    99</body>
    1010</html>

  • trunk/LayoutTests/fast/backgrounds/script-tests/TEMPLATE.html

    r97881 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    77<script src="YOUR_JS_FILE_HERE"></script>
    8 <script src="../js/resources/js-test-post.js"></script>
     8<script src="../../resources/js-test-post.js"></script>
    99</body>
    1010</html>

  • trunk/LayoutTests/fast/backgrounds/size/parsing-background-size-values.html

    r97881 r155261  
    33<head>
    44<style type="text/css"></style>
    5 <script src="../../js/resources/js-test-pre.js"></script>
     5<script src="../../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    88<script src="resources/parsing-background-size-values.js"></script>
    9 <script src="../../js/resources/js-test-post.js"></script>
     9<script src="../../../resources/js-test-post.js"></script>
    1010</body>
    1111</html>

  • trunk/LayoutTests/fast/backgrounds/size/parsing-inherit.html

    r97881 r155261  
    33<head>
    44<style type="text/css"></style>
    5 <script src="../../js/resources/js-test-pre.js"></script>
     5<script src="../../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    88<script src="resources/parsing-inherit.js"></script>
    9 <script src="../../js/resources/js-test-post.js"></script>
     9<script src="../../../resources/js-test-post.js"></script>
    1010</body>
    1111</html>

  • trunk/LayoutTests/fast/block/block-parent-with-zero-width-child.html

    r116331 r155261  
    11<head>
    22<title>Test case for bug https://bugs.webkit.org/show_bug.cgi?id=50135</title>
    3 <script src="../js/resources/js-test-pre.js"></script>
     3<script src="../../resources/js-test-pre.js"></script>
    44<style>
    55

  • trunk/LayoutTests/fast/block/block-with-inline-replaced-child-following-text.html

    r133292 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55<script>
    66function getComputedStyleForElement(element, cssPropertyName)

  • trunk/LayoutTests/fast/block/margin-collapse/webkit-margin-collapse-separate-position.html

    r143617 r155261  
    11<html>
    22    <head>
    3         <script src="../../../fast/js/resources/js-test-pre.js"></script>
     3        <script src="../../../resources/js-test-pre.js"></script>
    44        <style>
    55        .container {
    … …  
    3737        shouldEvaluateTo('document.getElementById("22px_height").offsetHeight', '22');
    3838        </script>
    39         <script src="../../../fast/js/resources/js-test-post.js"></script>
     39        <script src="../../../resources/js-test-post.js"></script>
    4040    </body>
    4141</html>

  • trunk/LayoutTests/fast/block/positioning/hittest-on-relative-positioned-children.html

    r120681 r155261  
    33<html>
    44<head>
    5 <script src="../../js/resources/js-test-pre.js"></script>
     5<script src="../../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    … …  
    7070
    7171</script>
    72 <script src="../../js/resources/js-test-post.js"></script>
     72<script src="../../../resources/js-test-post.js"></script>
    7373</body>
    7474</html>

  • trunk/LayoutTests/fast/block/positioning/relayout-nested-positioned-elements-crash.html

    r99220 r155261  
    11<html>
    22<head>
    3 <script src="../../../fast/js/resources/js-test-pre.js"></script>
     3<script src="../../../resources/js-test-pre.js"></script>
    44</head>
    55<body>
    … …  
    3030}
    3131</script>
    32 <script src="../../js/resources/js-test-post.js"></script>
     32<script src="../../../resources/js-test-post.js"></script>
    3333</body>
    3434</html>

  • trunk/LayoutTests/fast/borders/border-radius-child.html

    r147635 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55<script>
    66var x, y;

  • trunk/LayoutTests/fast/borders/border-width-percent.html

    r98407 r155261  
    22<html>
    33<head>
    4 <script src="../js/resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55</head>
    66<body>
    … …  
    5656shouldBe("inputElementBorderWidth('image', 0, 'border-width: -10%')", "0");
    5757</script>
    58 <script src="../js/resources/js-test-post.js"></script>
     58<script src="../../resources/js-test-post.js"></script>
    5959</body>
    6060</html>

  • trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-parsing.html

    r118853 r155261  
    33<head>
    44<meta charset="utf-8">
    5 <script src="../js/resources/js-test-pre.js"></script>
     5<script src="../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    … …  
    3434
    3535</script>
    36 <script src="../js/resources/js-test-post.js"></script>
     36<script src="../../resources/js-test-post.js"></script>
    3737</body>
    3838</html>

  • trunk/LayoutTests/fast/box-shadow/box-shadow-parsing-invalid.html

    r146762 r155261  
    33<head>
    44<link rel="stylesheet" href="../js/resources/js-test-style.css">
    5 <script src="../js/resources/js-test-pre.js"></script>
     5<script src="../../resources/js-test-pre.js"></script>
    66</head>
    77<body>
    … …  
    99<div id="console"></div>
    1010<script src="script-tests/box-shadow-parsing-invalid.js"></script>
    11 <script src="../js/resources/js-test-post.js"></script>
     11<script src="../../resources/js-test-post.js"></script>
    1212</body>
    1313</html>

  • trunk/LayoutTests/fast/box-sizing/css-table-with-box-sizing.html

    r121309 r155261  
    3434  <p id="t4" class="test css-table content-box">120x120<br>css-table<br>content-box</p>
    3535</div>
    36   <script src="../js/resources/js-test-pre.js"></script>
     36  <script src="../../resources/js-test-pre.js"></script>
    3737  <script>
    3838    description("Test case for bug 89819. This tests CSS 'table' and 'inline-table' with box-sizing.");
    … …  
    4949    document.getElementById("testContent").style.display = 'none';
    5050</script>
    51 <script src="../js/resources/js-test-post.js"></script>
     51<script src="../../resources/js-test-post.js"></script>
    5252</body>
    5353</html>

  • trunk/LayoutTests/fast/box-sizing/table-cell.html

    r99258 r155261  
    2929</table>
    3030
    31 <script src="../js/resources/js-test-pre.js"></script>
     31<script src="../../resources/js-test-pre.js"></script>
    3232<script>
    3333description('Tests that display: table-cell and box-sizing: border-box work when used together.');
    … …  
    4141
    4242</script>
    43 <script src="../js/resources/js-test-post.js"></script>
     43<script src="../../resources/js-test-post.js"></script>
Note: See TracChangeset for help on using the changeset viewer.