Changeset 166610 in webkit


Ignore:
Timestamp:
Apr 1, 2014 2:22:56 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Grid Layout] Make the grid-item-margin-auto-columns-rows.html test a reftest
​https://bugs.webkit.org/show_bug.cgi?id=130935

Patch by Javier Fernandez <​jfernandez@igalia.com> on 2014-04-01
Reviewed by Darin Adler.

Removed the 'checkLayout' script references from the test.

  • fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html: Added.
  • fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt: Removed.
  • fast/css-grid-layout/grid-item-margin-auto-columns-rows.html:
Location:
trunk/LayoutTests
Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r166603 r166610  
     12014-04-01  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        [CSS Grid Layout] Make the grid-item-margin-auto-columns-rows.html test a reftest
     4        https://bugs.webkit.org/show_bug.cgi?id=130935
     5
     6        Reviewed by Darin Adler.
     7
     8        Removed the 'checkLayout' script references from the test.
     9
     10        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html: Added.
     11        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.txt: Removed.
     12        * fast/css-grid-layout/grid-item-margin-auto-columns-rows.html:
     13
    1142014-04-01  Myles C. Maxfield  <mmaxfield@apple.com>
    215

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html

    r166450 r166610  
    55    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
    66</script>
    7 <script src="../../resources/check-layout.js"></script>
    87<link href="resources/grid.css" rel="stylesheet">
    98<style>
    … …  
    2625    margin-bottom: 20px;
    2726}
     27
     28.testContainer {
     29    position: relative;
     30    margin-bottom: 20px;
     31}
     32
    2833</style>
    2934</head>
    30 <body onload="checkLayout('.grid')">
     35<body>
    3136
    3237<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
    3338
    34 <div style="position: relative">
    35     <div class="grid" data-expected-width="200" data-expected-height="120">
     39<div class="testContainer">
     40    <div class="grid">
    3641        <div class="gridItem marginTop firstRowFirstColumn"></div>
    3742        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    4146</div>
    4247
    43 <div style="position: relative">
    44     <div class="grid" data-expected-width="200" data-expected-height="100">
     48<div class="testContainer">
     49    <div class="grid">
    4550        <div class="gridItem marginTop firstRowFirstColumn"></div>
    4651        <div class="gridItem marginBottom firstRowSecondColumn"></div>
    … …  
    5055</div>
    5156
    52 <div style="position: relative">
    53     <div class="grid verticalRL" data-expected-width="200" data-expected-height="120">
     57<div class="testContainer">
     58    <div class="grid verticalRL">
    5459        <div class="gridItem marginTop firstRowFirstColumn"></div>
    5560        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    5964</div>
    6065
    61 <div style="position: relative">
    62     <div class="grid verticalRL" data-expected-width="200" data-expected-height="100">
     66<div class="testContainer">
     67    <div class="grid verticalRL">
    6368        <div class="gridItem marginTop firstRowFirstColumn"></div>
    6469        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    6873</div>
    6974
    70 <div style="position: relative">
    71     <div class="grid verticalLR" data-expected-width="200" data-expected-height="120">
     75<div class="testContainer">
     76    <div class="grid verticalLR">
    7277        <div class="gridItem marginTop firstRowFirstColumn"></div>
    7378        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    7782</div>
    7883
    79 <div style="position: relative">
    80     <div class="grid verticalLR" data-expected-width="200" data-expected-height="100">
     84<div class="testContainer">
     85    <div class="grid verticalLR">
    8186        <div class="gridItem marginTop firstRowFirstColumn"></div>
    8287        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    8691</div>
    8792
    88 <div style="position: relative">
    89     <div class="grid horizontalBT" data-expected-width="200" data-expected-height="120">
     93<div class="testContainer">
     94    <div class="grid horizontalBT">
    9095        <div class="gridItem marginTop firstRowFirstColumn"></div>
    9196        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    95100</div>
    96101
    97 <div style="position: relative">
    98     <div class="grid horizontalBT" data-expected-width="200" data-expected-height="100">
     102<div class="testContainer">
     103    <div class="grid horizontalBT">
    99104        <div class="gridItem marginTop firstRowFirstColumn"></div>
    100105        <div class="gridItem marginBottom firstRowSecondColumn"></div>
    … …  
    105110
    106111<!-- rtl direction -->
    107 <div style="position: relative">
    108     <div class="grid directionRTL" data-expected-width="200" data-expected-height="120">
     112<div class="testContainer">
     113    <div class="grid directionRTL">
    109114        <div class="gridItem marginTop firstRowFirstColumn"></div>
    110115        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    114119</div>
    115120
    116 <div style="position: relative">
    117     <div class="grid directionRTL" data-expected-width="200" data-expected-height="100">
     121<div class="testContainer">
     122    <div class="grid directionRTL">
    118123        <div class="gridItem marginTop firstRowFirstColumn"></div>
    119124        <div class="gridItem marginBottom firstRowSecondColumn"></div>
    … …  
    123128</div>
    124129
    125 <div style="position: relative">
    126     <div class="grid verticalRL directionRTL" data-expected-width="200" data-expected-height="120">
     130<div class="testContainer">
     131    <div class="grid verticalRL directionRTL">
    127132        <div class="gridItem marginTop firstRowFirstColumn"></div>
    128133        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    132137</div>
    133138
    134 <div style="position: relative">
    135     <div class="grid verticalRL directionRTL" data-expected-width="200" data-expected-height="100">
     139<div class="testContainer">
     140    <div class="grid verticalRL directionRTL">
    136141        <div class="gridItem marginTop firstRowFirstColumn"></div>
    137142        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    141146</div>
    142147
    143 <div style="position: relative">
    144     <div class="grid verticalLR directionRTL" data-expected-width="200" data-expected-height="120">
     148<div class="testContainer">
     149    <div class="grid verticalLR directionRTL">
    145150        <div class="gridItem marginTop firstRowFirstColumn"></div>
    146151        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    150155</div>
    151156
    152 <div style="position: relative">
    153     <div class="grid verticalLR directionRTL" data-expected-width="200" data-expected-height="100">
     157<div class="testContainer">
     158    <div class="grid verticalLR directionRTL">
    154159        <div class="gridItem marginTop firstRowFirstColumn"></div>
    155160        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    159164</div>
    160165
    161 <div style="position: relative">
    162     <div class="grid horizontalBT directionRTL" data-expected-width="200" data-expected-height="120">
     166<div class="testContainer">
     167    <div class="grid horizontalBT directionRTL">
    163168        <div class="gridItem marginTop firstRowFirstColumn"></div>
    164169        <div class="gridItem firstRowSecondColumn"></div>
    … …  
    168173</div>
    169174
    170 <div style="position: relative">
    171     <div class="grid horizontalBT directionRTL" data-expected-width="200" data-expected-height="100">
     175<div class="testContainer">
     176    <div class="grid horizontalBT directionRTL">
    172177        <div class="gridItem marginTop firstRowFirstColumn"></div>
    173178        <div class="gridItem marginBottom firstRowSecondColumn"></div>
Note: See TracChangeset for help on using the changeset viewer.