[CSS Shapes] New positioning model: support for circle and ellipse shape-outside
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jul 2013 18:20:50 +0000 (18:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jul 2013 18:20:50 +0000 (18:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=118084

Patch by Bem Jones-Bey <bjonesbe@adobe.com> on 2013-07-25
Reviewed by Dirk Schulze.

Update circle and ellipse tests to work with new positioning. These
have been rehomed as W3C spec tests, and thus are imported from the
CSSWG's repository.

* TestExpectations: Remove skip for updated tests.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle-expected.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse-expected.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse.html.
* csswg/submitted/shapes/shape-outside/w3c-import.log:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153337 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html [moved from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle-expected.html with 76% similarity]
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html [moved from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle.html with 63% similarity]
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html [moved from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse-expected.html with 76% similarity]
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html [moved from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse.html with 71% similarity]
LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log

index ab62b36..d49c596 100644 (file)
@@ -1,3 +1,21 @@
+2013-07-25  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Shapes] New positioning model: support for circle and ellipse shape-outside
+        https://bugs.webkit.org/show_bug.cgi?id=118084
+
+        Reviewed by Dirk Schulze.
+
+        Update circle and ellipse tests to work with new positioning. These
+        have been rehomed as W3C spec tests, and thus are imported from the
+        CSSWG's repository.
+
+        * TestExpectations: Remove skip for updated tests.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle-expected.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse-expected.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse.html.
+        * csswg/submitted/shapes/shape-outside/w3c-import.log:
+
 2013-07-19  Filip Pizlo  <fpizlo@apple.com>
 
         fourthTier: String GetByVal out-of-bounds handling is so wrong
index 100a580..b3dd8e1 100644 (file)
@@ -26,9 +26,6 @@ webkit.org/b/118088 fast/shapes/shape-outside-floats/shape-outside-floats-ellips
 webkit.org/b/118088 fast/shapes/shape-outside-floats/shape-outside-floats-left-margin-polygon.html [ Skip ]
 webkit.org/b/118088 fast/shapes/shape-outside-floats/shape-outside-floats-right-margin-polygon.html [ Skip ]
 
-webkit.org/b/118084 fast/shapes/shape-outside-floats/shape-outside-floats-simple-circle.html [ Skip ]
-webkit.org/b/118084 fast/shapes/shape-outside-floats/shape-outside-floats-simple-ellipse.html [ Skip ]
-
 webkit.org/b/118085 fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html [ Skip ]
 
 webkit.org/b/118086 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html [ Skip ]
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
-<html>
-<head>
+<title>shape-outside-floats-circle-000-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem dom">
 <style>
 .container {
     position: relative;
@@ -15,7 +16,6 @@
     height: 160px;
     border-radius: 80px;
     border: 1px solid blue;
-    margin: -1px; /* shape-outside layout is unaffected by the border */
 }
 
 #left-circle-outline {
@@ -27,7 +27,7 @@
 #right-circle-outline {
     position: absolute;
     top: 20px;
-    left: 340px;
+    right: 0px;
 }
 
 .left-circle-float-line {
@@ -42,8 +42,7 @@
     height: 20px;
 }
 </style>
-
-<h2><a href="https://bugs.webkit.org/show_bug.cgi?id=98676">Bug 98673</a> - [CSS Exclusions] shape-outside on floats for circle and ellipse shapes</h2>
+<body>
 <p>The black squares should trace the right side of the circle's blue outline.</p>
 <div class="container">
 X<br/>
@@ -75,13 +74,14 @@ X<br/>
 X<br/>
 X
 </div>
-</body>
 
-<script src="../resources/rounded-rectangle.js"></script>
-<script src="../resources/subpixel-utils.js"></script>
+<script src="resources/rounded-rectangle.js"></script>
+<script src="resources/subpixel-utils.js"></script>
 <script>
+// Note that the border must be added into the width to account for its
+// affect on float positioning.
 genLeftRightRoundedRectFloatShapeOutsideRefTest({
-    roundedRect: {x: 0, y: 20, width: 160, height: 160, rx: 80, ry: 80},
+    roundedRect: {x: 0, y: 20, width: 161, height: 160, rx: 80, ry: 80},
     containerWidth: 500, 
     containerHeight: 200,
     lineHeight: 20,
@@ -90,6 +90,4 @@ genLeftRightRoundedRectFloatShapeOutsideRefTest({
 });
 </script>
 
-</html>
-
-
+</body>
@@ -1,9 +1,13 @@
 <!DOCTYPE html>
-<html>
-<head>
+<title>CSS Test: circle shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-circle-000-reference.html">
+<meta name="flags" content="ahem">
 <script>
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
+// This is required to run the tests in WebKit's test infrastructure.
+if (window.internals)
+    window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
@@ -22,7 +26,7 @@
 }
 </style>
 
-<h2><a href="https://bugs.webkit.org/show_bug.cgi?id=98676">Bug 98673</a> - [CSS Exclusions] shape-outside on floats for circle and ellipse shapes</h2>
+<body>
 <p>The black squares should trace the right side of the circle's blue outline.</p>
 <div class="container">
 X<br/>
@@ -53,4 +57,3 @@ X<br/>
 X
 </div>
 </body>
-</html>
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
-<html>
-<head>
+<title>shape-outside-floats-ellipse-000-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem dom">
 <style>
 .container {
     position: relative;
@@ -15,7 +16,6 @@
     height: 160px;
     border-radius: 160px / 80px;
     border: 1px solid blue;
-    margin: -1px; /* shape-outside layout is unaffected by the border */
 }
 
 #left-ellipse-outline {
@@ -27,7 +27,7 @@
 #right-ellipse-outline {
     position: absolute;
     top: 20px;
-    left: 180px;
+    right: 0px;
 }
 
 .left-ellipse-float-line {
@@ -43,7 +43,7 @@
 }
 </style>
 
-<h2><a href="https://bugs.webkit.org/show_bug.cgi?id=98673">Bug 98673</a> - [CSS Exclusions] shape-outside on floats for circle and ellipse shapes</h2>
+<body>
 <p>The black squares should trace the right side of the ellipse's blue outline.</p>
 <div class="container">
 X<br/>
@@ -77,11 +77,13 @@ X
 </div>
 </body>
 
-<script src="../resources/rounded-rectangle.js"></script>
-<script src="../resources/subpixel-utils.js"></script>
+<script src="resources/rounded-rectangle.js"></script>
+<script src="resources/subpixel-utils.js"></script>
 <script>
+// Note that the border must be added into the width to account for its
+// affect on float positioning.
 genLeftRightRoundedRectFloatShapeOutsideRefTest({
-    roundedRect: {x: 0, y: 20, width: 320, height: 160, rx: 160, ry: 80},
+    roundedRect: {x: 0, y: 20, width: 321, height: 160, rx: 160, ry: 80},
     containerWidth: 500, 
     containerHeight: 200,
     lineHeight: 20,
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
-<html>
-<head>
-<script>
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-</script>
+<title>CSS Test: circle shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-ellipse-000-reference.html">
+<meta name="flags" content="ahem">
 <style>
 .container {
     font: 20px/1 Ahem, sans-serif;
@@ -22,7 +21,7 @@
 }
 </style>
 
-<h2><a href="https://bugs.webkit.org/show_bug.cgi?id=98673">Bug 98673</a> - [CSS Exclusions] shape-outside on floats for circle and ellipse shapes</h2>
+<body>
 <p>The black squares should trace the right side of the ellipse's blue outline.</p>
 <div class="container">
 X<br/>
@@ -53,4 +52,3 @@ X<br/>
 X
 </div>
 </body>
-</html>
index 46097ad..836abb7 100644 (file)
@@ -8,7 +8,7 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2013-07-23 13:57
+Last Import: 2013-07-24 17:22
 W3C Mercurial changeset: Not Available
 Test status at time of import: unknown
 ------------------------------------------------------------------------
@@ -41,5 +41,9 @@ List of files:
 /LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html
 /LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html
 /LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html
 /LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js
 /LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js