From 662b559413c6d04b806fa1ecd343f15d8c64af62 Mon Sep 17 00:00:00 2001
From: Brad Werth <bwerth@mozilla.com>
Date: Mon, 23 Apr 2018 15:13:17 -0700
Subject: [PATCH] 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

--HG--
extra : rebase_source : cab6edb2156d1b000c234866816a81f9b42d5815
---
 testing/web-platform/meta/MANIFEST.json       | 52 +++++++++++++----
 .../inset/shape-outside-inset-028.html        | 56 +++++++++++++++++++
 .../inset/shape-outside-inset-029.html        | 56 +++++++++++++++++++
 3 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html
 create mode 100644 testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 637611f79a85..be804b6bbfd1 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -127101,6 +127101,30 @@
      {}
     ]
    ],
+   "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",
@@ -511469,7 +511493,7 @@
    "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": [
@@ -511669,7 +511693,7 @@
    "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": [
@@ -511709,7 +511733,7 @@
    "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": [
@@ -511717,7 +511741,7 @@
    "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": [
@@ -511765,27 +511789,35 @@
    "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": [
diff --git a/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html
new file mode 100644
index 000000000000..2e0d9abed541
--- /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>
diff --git a/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html
new file mode 100644
index 000000000000..fe30d4371f7a
--- /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>