Bug 1265342 Part 13: Add two new WPT tests of shape-outside: inset with shape-margin, and update manifests. r=dholbert
☠☠ backed out by 723a9f786923 ☠ ☠
authorBrad Werth <bwerth@mozilla.com>
Mon, 23 Apr 2018 15:13:17 -0700
changeset 468983 6c80ec2d039813b285559e6b853998f566d1fa35
parent 468982 62d57191608624c4ff9dbb4eb6d8f4cb868ad829
child 468984 7b4cbe358d21acbae45ff5d277c7e5a62330e8a9
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1265342
milestone61.0a1
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
Bug 1265342 Part 13: Add two new WPT tests of shape-outside: inset with shape-margin, and update manifests. r=dholbert MozReview-Commit-ID: EDJZHW89AT6
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html
testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -127096,16 +127096,40 @@
       [
        "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html": [
+    [
+     "/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html": [
+    [
+     "/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html": [
     [
      "/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html",
      [
       [
        "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html",
        "=="
       ]
@@ -511464,17 +511488,17 @@
    "b6f517c8fc7366059b1b18828a86424ae610f034",
    "reftest"
   ],
   "css/css-shapes/shape-outside/shape-image/shape-image-009.html": [
    "78027333ccb7d464be62f98aa7da29ca3e019e5f",
    "reftest"
   ],
   "css/css-shapes/shape-outside/shape-image/shape-image-010.html": [
-   "69b7cd75faad315f1c87214d7f74cbebeba0f37d",
+   "6dcfc209b1e08c1a3f41036a301fa3e0a434b4af",
    "reftest"
   ],
   "css/css-shapes/shape-outside/shape-image/shape-image-011.html": [
    "6da1e21d2aa27de6bda5e54f5bd6774c1a703df1",
    "reftest"
   ],
   "css/css-shapes/shape-outside/shape-image/shape-image-012.html": [
    "f51a03437d51c0adf2df9f3b5a4b4636a92cc2dd",
@@ -511664,17 +511688,17 @@
    "f44f9d95f590411d54ff62c1fc4d197c08da305e",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html": [
    "306ae7a9d55b69e6c7ef8730ebd22a71158abe50",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html": [
-   "97237d7bc6fb98fc1cc0b27d493b2610d91b483b",
+   "87477b60302ae3f7e20c488b5a944d7b9169ba0d",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html": [
    "9da0fefa70200d36c785bfc5c603ecb3957cd1ff",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html": [
    "d1b189df9fabd1e3cbaf10cfb826bb776402f4c3",
@@ -511704,25 +511728,25 @@
    "8368712ca29c3eb5b8fd90a6017af9eeed9c5ea8",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html": [
    "3e7400754454db8e5f33d89f320cfe1cb5763dc4",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html": [
-   "e6001d6ecc8565842fa1fe68ce280c06a17ee62a",
+   "121434db8bfc63877d10383c167ee3f2f8d65d7a",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html": [
    "c3b3f36f7094c73d2f6b7f9debec7e1f8e7f11be",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html": [
-   "ff109f0d61bd487df7834e8c56330a5c6f4bc52d",
+   "c16469402616b77d502ed4a65b623022a883c902",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html": [
    "23bbc570be6e7736df699113f7d87910f0dfb220",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html": [
    "15ff9291c3c0d83df8e22b1885b6c5feb4b5cf12",
@@ -511760,37 +511784,45 @@
    "c0bda7580321b018b8388345695f2ed5e375dd0b",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html": [
    "2ff0a823637310a9d9bdca4d459df3bf3542580b",
    "support"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html": [
-   "7878c4b4b0cd5b36e153d4fad565b37a1aeb746d",
+   "0a1a7449964d3dc18dbabb4da8777f7e1aedbf7e",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html": [
-   "bda8e62930c2f084005998d1e1679c5ff85f25a0",
+   "e98e70e094d84a2434d5d634caa482df9e6aeb07",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html": [
-   "5ef1e674163f358a2dbac6fd6175ff424e2a46ba",
+   "39ba9b59b93ada88d6655529a8af3d3d6d7c00be",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html": [
-   "2347978786094f1a6bb4a5a9a030c7a11cc85781",
+   "d53115c05401ffd274b55c6a95c9e4fd05011da1",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html": [
-   "124c822825bb26bec99543892f75ea0b11b0e74c",
+   "2ef7ecd7321bb6639490110e45118ec58ee2aa9c",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html": [
-   "23eab9e83a350804230169f4edc5e50a55716fe7",
+   "04a6a67837127ba47e757e5cc3a9ff91c1e01d9a",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html": [
+   "cafd680e210a6d677bde00ae4c5f9263c1e7b48e",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html": [
+   "67161f08b8aec3fe9bd94e14cbe865dd4c9d3664",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html": [
    "3ee945e85e3c2a9b502e93c04ed53966551e7df1",
    "support"
   ],
   "css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-010-ref.html": [
    "890dd0754f2c985719c75200dd9ef70e8c1abe14",
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: left float, 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 rounded rectangle in px units with
+                                     a shape-margin.">
+    </head>
+    <style>
+        #container {
+            position: relative;
+            margin-left: 25px;
+        }
+        #test-container {
+            width: 200px;
+            height: 200px;
+            font: 25px/1 Ahem;
+            background-color: red;
+            color: green;
+            text-align: right;
+        }
+        #test-shape {
+            float: right;
+            width: 200px;
+            height: 200px;
+            background-color: green;
+            shape-margin: 10px;
+            shape-outside: inset(60px 10px 60px 110px round 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="test-container">
+                <div id="test-shape"></div>
+                XXXXXXXX XXXXXXXX XXXX XXXX XXXX XXXX XXXXXXXX XXXXXXXX
+            </div>
+            <div id="static-shape"></div>
+        </div>
+    </body>
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: left float, 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.">
+    </head>
+    <style>
+        #container {
+            position: relative;
+            margin-left: 25px;
+        }
+        #test-container {
+            width: 200px;
+            height: 200px;
+            font: 25px/1 Ahem;
+            background-color: red;
+            color: green;
+            text-align: right;
+        }
+        #test-shape {
+            float: right;
+            width: 200px;
+            height: 200px;
+            background-color: green;
+            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="test-container">
+                <div id="test-shape"></div>
+                XXXXXXXX XXXXXXXX XXXX XXXX XXXX XXXX XXXXXXXX XXXXXXXX
+            </div>
+            <div id="static-shape"></div>
+        </div>
+    </body>
+</html>