Changeset 149857 in webkit


Ignore:
Timestamp:
May 9, 2013 5:12:25 PM (11 years ago)
Author:
zoltan@webkit.org
Message:

[Qt] REGRESSION (r148975) shape-inside-percentage.html and shape-inside-overflow-fixed-dimensions.html are failing after r148975
​https://bugs.webkit.org/show_bug.cgi?id=115053

Reviewed by Alexandru Chiculita.

I changed the tests to use Ahem font (overflow will be the same on every port) and modify the markup in order to be the similar
for the two tests. The change fixes both tests and make them passing on Qt as well. I removed the tests from the TestExpectations.

  • fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html:
  • fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html:
  • fast/exclusions/shape-inside/shape-inside-percentage-expected.html:
  • fast/exclusions/shape-inside/shape-inside-percentage.html:
  • platform/qt/TestExpectations:
Location:
trunk/LayoutTests
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r149856 r149857  
     12013-05-09  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        [Qt] REGRESSION (r148975) shape-inside-percentage.html and shape-inside-overflow-fixed-dimensions.html are failing after r148975
     4        https://bugs.webkit.org/show_bug.cgi?id=115053
     5
     6        Reviewed by Alexandru Chiculita.
     7
     8        I changed the tests to use Ahem font (overflow will be the same on every port) and modify the markup in order to be the similar
     9        for the two tests. The change fixes both tests and make them passing on Qt as well. I removed the tests from the TestExpectations.
     10
     11        * fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html:
     12        * fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html:
     13        * fast/exclusions/shape-inside/shape-inside-percentage-expected.html:
     14        * fast/exclusions/shape-inside/shape-inside-percentage.html:
     15        * platform/qt/TestExpectations:
     16
    1172013-05-09  Yael Aharon  <yael.aharon@intel.com>
    218

  • trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html

    r148975 r149857  
    33<head>
    44<style>
    5 #shape-inside {
     5#container {
     6    font: 20px Ahem, sans-serif;
     7    line-height: 20px;
    68    border: 2px solid blue;
    79    position: relative;
    810    width: 200px;
    911    height: 200px;
    10     line-height: 20px;
     12    margin-bottom: 60px;
    1113}
    1214#border {
    1315    position: absolute;
    14     left: 58px;
     16    left: 48px;
    1517    width: 100px;
    1618    height: 40px;
    … …  
    2426</head>
    2527<body>
    26 <div id="border"></div>
    27 <div id="shape-inside">
    28     <div class="spacer" style="float:left"></div>
    29     <div class="spacer" style="float:right"></div>
    30     This text should wrap
    31     <div style="padding-top: 162px;">
    32         inside the green rectangle, and overflow should wrap outside the blue rectangle.
     28    <div id="container">
     29        <div id="border"></div>
     30        <div id="shape-inside">
     31            <div class="spacer" style="float:left"></div>
     32            <div class="spacer" style="float:right"></div>
     33            X X X X X X
     34        </div>
     35        <div style="padding-top: 160px;">
     36            X X X X X X X X X X
     37        </div>
    3338    </div>
    34 </div>
     39<p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
     40<p>Bug <a href="http://webkit.org/b/114526">114526</a>: [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
    3541</body>
    3642</html>

  • trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html

    r148975 r149857  
    77</script>
    88<style>
    9 #shape-inside {
     9#container {
     10    font: 20px Ahem, sans-serif;
     11    line-height: 20px;
    1012    border: 2px solid blue;
    1113    position: relative;
    1214    width: 200px;
    1315    height: 200px;
    14     line-height: 20px;
    1516    -webkit-shape-inside: rectangle(50px, 0px, 100px, 45px);
     17    margin-bottom: 60px;
     18}
     19#shape-inside {
     20    width: 200px;
     21    height: 200px;
     22    -webkit-shape-inside: rectangle(50px, 0px, 100px, 50px);
    1623}
    1724#border {
    1825    position: absolute;
    19     left: 58px;
     26    left: 48px;
    2027    width: 100px;
    2128    height: 40px;
    … …  
    2532</head>
    2633<body>
    27 <div id="border"></div>
    28 <div id="shape-inside">
    29     This text should wrap inside the green rectangle, and overflow should wrap
    30     outside the blue rectangle.
    31 </div>
     34    <div id="container">
     35        <div id="border"></div>
     36        <div id="shape-inside">
     37            X X X X X X X X X X X X X X X X
     38        </div>
     39    </div>
     40    <p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
     41    <p>Bug <a href="http://webkit.org/b/114526">114526</a>: [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
    3242</body>
    3343</html>

  • trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage-expected.html

    r148975 r149857  
    44<style>
    55    #container {
     6        font: 20px Ahem, sans-serif;
     7        line-height: 20px;
    68        border: 2px solid blue;
    79        position: relative;
    810        width: 200px;
    911        height: 200px;
     12        margin-bottom: 60px;
    1013    }
    1114    #border {
    … …  
    2831            <div class="spacer" style="float:left"></div>
    2932            <div class="spacer" style="float:right"></div>
    30             This text should wrap
    31             <div style="padding-top: 164px;">
    32                 inside the green rectangle, and overflow should wrap outside the blue rectangle.
    33             </div>
     33            X X X X X X
     34        </div>
     35        <div style="padding-top: 160px;">
     36             X X X X X X X X X X
    3437        </div>
    3538    </div>
     39    <p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
     40    <p>Bug <a href="http://webkit.org/b/114526">114526</a>: [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
    3641</body>
    3742</html>

  • trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage.html

    r148975 r149857  
    88<style>
    99    #container {
     10        font: 20px Ahem, sans-serif;
     11        line-height: 20px;
    1012        border: 2px solid blue;
    1113        position: relative;
    1214        width: 200px;
    1315        height: 200px;
     16        margin-bottom: 60px;
    1417    }
    1518    #shape-inside {
    … …  
    3134        <div id="border"></div>
    3235        <div id="shape-inside">
    33             This text should wrap inside the green rectangle, and overflow should wrap
    34             outside the blue rectangle.
     36            X X X X X X X X X X X X X X X X
    3537        </div>
    3638    </div>
     39    <p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
     40    <p>Bug <a href="http://webkit.org/b/114526">114526</a>: [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
    3741</body>
    3842</html>

  • trunk/LayoutTests/platform/qt/TestExpectations

    r149802 r149857  
    15091509fast/css/square-button-appearance.html
    15101510
    1511 # [Qt] REGRESSION (r148975) shape-inside-percentage.html and shape-inside-overflow-fixed-dimensions.html are failing after r148975
    1512 # https://bugs.webkit.org/show_bug.cgi?id=115053
    1513 fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html
    1514 fast/exclusions/shape-inside/shape-inside-percentage.html
    15151511fast/exclusions/shape-inside/shape-inside-polygon-layout.html
    15161512
Note: See TracChangeset for help on using the changeset viewer.