Backed out 2 changesets (bug 1460041) for linting failure at css/vendor-imports/mozilla/mozilla-central-reftests/shapes1 e.g. shape-outside-circle-056-ref.html on a CLOSED TREE
authorCoroiu Cristina <ccoroiu@mozilla.com>
Thu, 10 May 2018 20:15:58 +0300
changeset 417771 d9db16ca4471aab712d5b57448bf1967c6e48916
parent 417770 afe7cbee7576bdb31db4eacc9c142700ea48b0c8
child 417772 db808e8d92b42bf899350a1148b975140c46f1a0
push id33980
push userebalazs@mozilla.com
push dateFri, 11 May 2018 09:35:12 +0000
treeherdermozilla-central@8e9a4a323f0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1460041
milestone62.0a1
backs outb19f3977715cc2b3bb2fd05ac8d6323cedbeb4a1
a1dbfe37baf38c8fde97093cdbafcb4f95acfcdf
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1460041) for linting failure at css/vendor-imports/mozilla/mozilla-central-reftests/shapes1 e.g. shape-outside-circle-056-ref.html on a CLOSED TREE Backed out changeset b19f3977715c (bug 1460041) Backed out changeset a1dbfe37baf3 (bug 1460041)
layout/generic/nsFloatManager.cpp
testing/web-platform/tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html
testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html
--- a/layout/generic/nsFloatManager.cpp
+++ b/layout/generic/nsFloatManager.cpp
@@ -1404,27 +1404,27 @@ nsFloatManager::PolygonShapeInfo::Polygo
     // Find the left and right i intercepts of the polygon edge for this
     // block row, and adjust them to compensate for the expansion of the
     // inline dimension. If we're in the expanded region, or if we're using
     // a b that's less than the bStart of the polygon, the intercepts are
     // the nscoord min and max limits.
     nscoord bInAppUnits = (b - kbExpansionPerSide) * aAppUnitsPerDevPixel;
     bool bIsInExpandedRegion(b < kbExpansionPerSide ||
                              b >= bSize - kbExpansionPerSide);
+    bool bIsLessThanPolygonBStart(bInAppUnits < mBStart);
+    bool bIsMoreThanPolygonBEnd(bInAppUnits >= mBEnd);
 
     // We now figure out the i values that correspond to the left edge and
     // the right edge of the polygon at one-dev-pixel-thick strip of b. We
     // have a ComputeLineIntercept function that takes and returns app unit
     // coordinates in the space of aMarginRect. So to pass in b values, we
     // first have to add the aMarginRect.y value. And for the values that we
     // get out, we have to subtract away the aMarginRect.x value before
     // converting the app units to dev pixels.
     nscoord bInAppUnitsMarginRect = bInAppUnits + aMarginRect.y;
-    bool bIsLessThanPolygonBStart(bInAppUnitsMarginRect < mBStart);
-    bool bIsMoreThanPolygonBEnd(bInAppUnitsMarginRect >= mBEnd);
 
     const int32_t iLeftEdge = (bIsInExpandedRegion ||
                                bIsLessThanPolygonBStart ||
                                bIsMoreThanPolygonBEnd) ? nscoord_MAX :
       kiExpansionPerSide + NSAppUnitsToIntPixels(
         ComputeLineIntercept(bInAppUnitsMarginRect,
                              bInAppUnitsMarginRect + aAppUnitsPerDevPixel,
                              std::min<nscoord>, nscoord_MAX) - aMarginRect.x,
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Test: left float, url(png), real offset image + shape-margin (px)</title>
-    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
-    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
-    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
-    <link rel="match" href="reference/shape-image-006-ref.html"/>
-    <meta name="flags" content="ahem"/>
-    <meta name="assert" content="This test verifies that content wraps around all the image pixels
-                                 + the shape-margin when shape-outside is given a png file.
-                                 Additionally, the shape-outside: image element is offset from its
-                                 containing block."/>
-    <style type="text/css">
-        body {
-            margin: 0;
-        }
-        .container {
-          font: 50px/1 Ahem;
-          padding: 50px;
-          position: absolute;
-          top: 20px;
-          left: -40px;
-        }
-        #test {
-            width: 200px;
-            color: rgb(0,100,0);
-        }
-        #image {
-            float: left;
-            shape-outside: url("support/left-half-rectangle.png");
-            shape-margin: 10px;
-        }
-        .blue {
-            width: 2px;
-            height: 100px;
-            background-color: blue;
-        }
-        .left-line { left: 65px; }
-        .right-line { left: 125px; }
-
-        .failure {
-            left: 70px;
-            width: 50px;
-            height: 100px;
-            background-color: red;
-            z-index: -1;
-        }
-        .blue, .failure {
-            position: absolute;
-            top: 70px;
-        }
-    </style>
-</head>
-<body>
-    <p>
-        The test passes if the green rectangle on the right is completely between the two blue lines.
-        There should be no red.
-    </p>
-    <div id="test" class="container">
-        <img id="image" src="support/left-half-rectangle.png"/>
-        X<br/>X
-    </div>
-    <div class="blue left-line"></div>
-    <div class="blue right-line"></div>
-    <div class="failure"></div>
-</body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Test: left float, offset inset, px units</title>
-        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-inset">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
-        <link rel="match" href="reference/shape-outside-inset-010-ref.html"/>
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="The test verfies that text flows around a
-                                     right float with a shape-outside defined as
-                                     an inset irregular elliptically rounded
-                                     rectangle in px units with a shape-margin.
-                                     Additionally, the shape-outside: inset element is
-                                     offset from its containing block.">
-    </head>
-    <style>
-        #container {
-            position: relative;
-            margin-left: 25px;
-        }
-        #red {
-            position: absolute;
-            width: 200px;
-            height: 200px;
-            background-color: red;
-        }
-        #test-container {
-            width: 200px;
-            height: 200px;
-            font: 25px/1 Ahem;
-            color: green;
-            text-align: right;
-            padding: 50px;
-            position: absolute;
-            top: -50px;
-            left: -50px;
-        }
-        #test-shape {
-            float: right;
-            width: 200px;
-            height: 200px;
-            shape-margin: 10px;
-            shape-outside: inset(60px 10px 60px 110px round 70px 0px 0px 10px / 10px 0px 0px 20px);
-        }
-        #static-shape {
-            position: absolute;
-            left: 100px;
-            width: 100px;
-            height: 100px;
-            top: 50px;
-            background-color: green;
-        }
-    </style>
-    <body>
-        <p>The test passes if there is a green square and no red.</p>
-        <div id="container">
-            <div id="red"></div>
-            <div id="test-container">
-                <div id="test-shape"></div>
-                XXXXXXXX XXXXXXXX XXXX XXXX XXXX XXXX XXXXXXXX XXXXXXXX
-            </div>
-            <div id="static-shape"></div>
-        </div>
-    </body>
-</html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
@@ -55,17 +55,16 @@
 == shape-outside-circle-048.html shape-outside-circle-048-ref.html
 == shape-outside-circle-049.html shape-outside-circle-049-ref.html
 == shape-outside-circle-050.html shape-outside-circle-050-ref.html
 == shape-outside-circle-051.html shape-outside-circle-051-ref.html
 == shape-outside-circle-052.html shape-outside-circle-052-ref.html
 == shape-outside-circle-053.html shape-outside-circle-053-ref.html
 == shape-outside-circle-054.html shape-outside-circle-054-ref.html
 == shape-outside-circle-055.html shape-outside-circle-055-ref.html
-== shape-outside-circle-056.html shape-outside-circle-056-ref.html
 
 # Basic shape: ellipse()
 == shape-outside-ellipse-032.html shape-outside-ellipse-032-ref.html
 == shape-outside-ellipse-033.html shape-outside-ellipse-033-ref.html
 == shape-outside-ellipse-034.html shape-outside-ellipse-034-ref.html
 == shape-outside-ellipse-035.html shape-outside-ellipse-035-ref.html
 == shape-outside-ellipse-036.html shape-outside-ellipse-036-ref.html
 == shape-outside-ellipse-037.html shape-outside-ellipse-037-ref.html
@@ -78,17 +77,16 @@
 == shape-outside-ellipse-044.html shape-outside-ellipse-044-ref.html
 == shape-outside-ellipse-045.html shape-outside-ellipse-045-ref.html
 == shape-outside-ellipse-046.html shape-outside-ellipse-046-ref.html
 == shape-outside-ellipse-047.html shape-outside-ellipse-047-ref.html
 == shape-outside-ellipse-048.html shape-outside-ellipse-048-ref.html
 == shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
 == shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
 == shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
-== shape-outside-ellipse-052.html shape-outside-ellipse-052-ref.html
 
 # Basic shape: inset()
 == shape-outside-inset-016.html shape-outside-inset-016-ref.html
 == shape-outside-inset-017.html shape-outside-inset-017-ref.html
 == shape-outside-inset-018.html shape-outside-inset-018-ref.html
 == shape-outside-inset-019.html shape-outside-inset-019-ref.html
 == shape-outside-inset-020.html shape-outside-inset-020-ref.html
 == shape-outside-inset-021.html shape-outside-inset-021-ref.html
@@ -109,9 +107,8 @@
 == shape-outside-polygon-024.html shape-outside-polygon-024-ref.html
 == shape-outside-polygon-025.html shape-outside-polygon-025-ref.html
 == shape-outside-polygon-026.html shape-outside-polygon-026-ref.html
 == shape-outside-polygon-027.html shape-outside-polygon-027-ref.html
 == shape-outside-polygon-028.html shape-outside-polygon-026-ref.html
 == shape-outside-polygon-029.html shape-outside-polygon-027-ref.html
 == shape-outside-polygon-030.html shape-outside-polygon-030-ref.html
 == shape-outside-polygon-031.html shape-outside-polygon-031-ref.html
-== shape-outside-polygon-032.html shape-outside-polygon-032-ref.html
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Reference File</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com">
-    </head>
-    <style>
-       body {
-           margin: 0;
-       }
-       #container {
-           position: relative;
-       }
-       #line {
-           position: absolute;
-           top: 0px;
-           left: 168px;
-           width: 2px;
-           height: 200px;
-           border-left: 2px solid blue;
-       }
-       #square {
-           position: absolute;
-           top: 80px;
-           left: 170px;
-           width: 40px;
-           height: 40px;
-           background-color: green;
-       }
-    </style>
-    <body>
-        <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
-        <div id="container">
-            <div id="line"></div>
-            <div id="square"></div>
-        </div>
-    </body>
-</html>
-
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Test: left float, offset circle at top left + margin-box + shape-margin</title>
-        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-circle">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#margin-box">
-        <link rel="match" href="shape-outside-circle-056-ref.html">
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="The test verifies that text wraps around a
-                                     left float with a shape-outside defined as
-                                     a circle from the margin box and is positioned
-                                     top left with a shape-margin. Additionally, the
-                                     shape-outside: circle element is offset from
-                                     its containing block.">
-    </head>
-    <style>
-    body {
-        margin: 0;
-    }
-    #container {
-        position: relative;
-    }
-    #test-container {
-        font: 40px/1 Ahem, sans-serif;
-        width: 300px;
-        height: 200px;
-        padding: 50px;
-        position: absolute;
-        top: -50px;
-        left: -50px;
-        color: green;
-    }
-    #test-shape {
-        float: left;
-        width: 120px;
-        height: 120px;
-        margin: 10px;
-        padding: 10px;
-        border: 10px solid transparent;
-        shape-margin: 10px;
-        shape-outside: margin-box circle(99% at top left);
-    }
-    #line {
-        position: absolute;
-        top: 0px;
-        left: 168px;
-        width: 2px;
-        height: 200px;
-        border-left: 2px solid blue;
-    }
-    #failure {
-        position: absolute;
-        top: 80px;
-        left: 170px;
-        width: 40px;
-        height: 40px;
-        background-color: red;
-        z-index: -1;
-    }
-    </style>
-    <body>
-    <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
-    <div id="container">
-        <div id="test-container">
-            <div id="test-shape"></div>
-            <br/>
-            <br/>
-            X
-        </div>
-        <div id="line"></div>
-        <div id="failure"></div>
-    </div>
-    </body>
-</html>
-
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Reference File</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com">
-    </head>
-    <style>
-       body {
-           margin: 0;
-       }
-       #container {
-           position: relative;
-       }
-       #line {
-           position: absolute;
-           top: 0px;
-           left: 168px;
-           width: 2px;
-           height: 200px;
-           border-left: 2px solid blue;
-       }
-       #square {
-           position: absolute;
-           top: 80px;
-           left: 170px;
-           width: 40px;
-           height: 40px;
-           background-color: green;
-       }
-    </style>
-    <body>
-        <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
-        <div id="container">
-            <div id="line"></div>
-            <div id="square"></div>
-        </div>
-    </body>
-</html>
-
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Test: left float, offset ellipse + shape-margin in % units</title>
-        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-ellipse">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
-        <link rel="match" href="reference/shape-outside-ellipse-052-ref.html">
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="The test verifies that text wraps around a
-                                     left float with a shape-outside defined as
-                                     a ellipse with a shape-margin in pixel units.
-                                     Additionally, the shape-outside: ellipse element
-                                     is offset from its containing block.">
-    </head>
-    <style>
-    body {
-        margin: 0;
-    }
-    #container {
-        position: relative;
-    }
-    #test-container {
-        font: 40px/1 Ahem, sans-serif;
-        width: 300px;
-        height: 200px;
-        color: green;
-        padding: 50px;
-        position: absolute;
-        top: -50px;
-        left: -50px;
-    }
-    #test-shape {
-        float: left;
-        width: 140px;
-        height: 140px;
-        margin: 10px;
-        padding: 10px;
-        border: 10px solid transparent;
-        shape-margin: 30px;
-        shape-outside: ellipse(40px 28px);
-    }
-    #line {
-        position: absolute;
-        top: 0px;
-        left: 168px;
-        width: 2px;
-        height: 200px;
-        border-left: 2px solid blue;
-    }
-    #failure {
-        position: absolute;
-        top: 80px;
-        left: 170px;
-        width: 40px;
-        height: 40px;
-        background-color: red;
-        z-index: -1;
-    }
-    </style>
-    <body>
-    <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
-    <div id="container">
-        <div id="test-container">
-            <div id="test-shape"></div>
-            <br/>
-            <br/>
-            X
-        </div>
-        <div id="line"></div>
-        <div id="failure"></div>
-    </div>
-    </body>
-</html>
-
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Reference File</title>
-        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com">
-    </head>
-    <style>
-       body {
-            margin: 0;
-        }
-       #green-square {
-          position: absolute;
-          top: 50px;
-          left: 10px;
-          width: 240px;
-          height: 240px;
-          background-color: green;
-      }
-    </style>
-    <body>
-        <p>The test passes if there is green square and no red.</p>
-        <div id="green-square"></div>
-    </body>
-</html>
\ No newline at end of file
deleted file mode 100644
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>CSS Test: right float, offset polygon + margin-box + shape-margin</title>
-        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-polygon">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
-        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#margin-box">
-        <link rel="match" href="reference/shape-outside-polygon-032-ref.html">
-        <meta name="flags" content="ahem" />
-        <meta name="assert" content="The test verifies that text wraps around a
-                                     right float with a shape-outside defined as
-                                     an polygon from the margin box with a shape margin.
-                                     Additionally, the shape-outside: polygon element is
-                                     offset from its containing block.">
-    </head>
-    <style>
-        body {
-            margin: 0;
-        }
-        #red {
-            position: absolute;
-            top: 50px;
-            left: 10px;
-            width: 240px;
-            height: 240px;
-            background-color: red;
-        }
-        #container {
-            position: absolute;
-            top: 0px;
-            left: -40px;
-            font-size: 20px;
-            font-family: Ahem;
-            line-height: 20px;
-            width: 240px;
-            height: 240px;
-            padding: 50px;
-            color: green;
-        }
-        #test-shape {
-            float: right;
-            width: 120px;
-            height: 120px;
-            margin: 10px;
-            border: 10px solid transparent;
-            padding: 10px;
-            shape-margin: 20px;
-            shape-outside: margin-box polygon(20% 20%, 90% 20%, 90% 80%, 50% 80%, 50% 70%, 70% 70%, 70% 40%, 20% 40%);
-        }
-        .ref-shape {
-            position: absolute;
-            background-color: green;
-        }
-        #ref-1 {
-            top: 70px;
-            left: 70px;
-            width: 180px;
-            height: 80px;
-        }
-        #ref-2 {
-            top: 150px;
-            left: 150px;
-            width: 100px;
-            height: 20px;
-        }
-        #ref-3 {
-            top: 170px;
-            left: 130px;
-            width: 120px;
-            height: 60px;
-        }
-    </style>
-    <body>
-    <p>The test passes if there is green square and no red.</p>
-    <div id="red"></div>
-    <div id="container">
-        <div id="test-shape"></div>
-        XXXXXXXXXXXX XXX XXX XXX XXX XXXXXXX XXXXXX XXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX
-    </div>
-    <div id="ref-1" class="ref-shape"></div>
-    <div id="ref-2" class="ref-shape"></div>
-    <div id="ref-3" class="ref-shape"></div>
-    </body>
-</html>