Title: [153437] trunk/LayoutTests
Revision
153437
Author
[email protected]
Date
2013-07-29 12:20:24 -0700 (Mon, 29 Jul 2013)

Log Message

[CSS Shapes] New positioning model: update percentage rectangle and inset rectangle tests
https://bugs.webkit.org/show_bug.cgi?id=118086

Patch by Bem Jones-Bey <[email protected]> on 2013-07-29
Reviewed by Dirk Schulze.

Update percentage based tests to work with the new positioning model.
Also move the tests to be W3C spec tests, so they have been impored
back here from the CSSWG repo.

* TestExpectations: Remove skipping for replaced tests.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html: Added.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html: Added.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html: Added.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html: Added.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html: Added.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html: Added.
* csswg/submitted/shapes/shape-outside/w3c-import.log:
* fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage-expected.html: Removed.
* fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html: Removed.
* fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage-expected.html: Removed.
* fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html: Removed.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (153436 => 153437)


--- trunk/LayoutTests/ChangeLog	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/ChangeLog	2013-07-29 19:20:24 UTC (rev 153437)
@@ -1,3 +1,27 @@
+2013-07-29  Bem Jones-Bey  <[email protected]>
+
+        [CSS Shapes] New positioning model: update percentage rectangle and inset rectangle tests
+        https://bugs.webkit.org/show_bug.cgi?id=118086
+
+        Reviewed by Dirk Schulze.
+
+        Update percentage based tests to work with the new positioning model.
+        Also move the tests to be W3C spec tests, so they have been impored
+        back here from the CSSWG repo.
+
+        * TestExpectations: Remove skipping for replaced tests.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html: Added.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html: Added.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html: Added.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html: Added.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html: Added.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html: Added.
+        * csswg/submitted/shapes/shape-outside/w3c-import.log:
+        * fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage-expected.html: Removed.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html: Removed.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage-expected.html: Removed.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html: Removed.
+
 2013-07-29  Mario Sanchez Prada  <[email protected]>
 
         [ATK] Implement attributesOfChildren() for AccessibilityUIElement

Modified: trunk/LayoutTests/TestExpectations (153436 => 153437)


--- trunk/LayoutTests/TestExpectations	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/TestExpectations	2013-07-29 19:20:24 UTC (rev 153437)
@@ -26,9 +26,6 @@
 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/118086 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html [ Skip ]
-webkit.org/b/118086 fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html [ Skip ]
-
 webkit.org/b/118087 fast/shapes/shape-outside-floats/shape-outside-floats-stacked.html [ Skip ]
 webkit.org/b/118087 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-horizontal-multiple.html [ Skip ]
 

Modified: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js (153436 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js	2013-07-29 19:20:24 UTC (rev 153437)
@@ -1,4 +1,5 @@
 var SubPixelLayout = (function() {
+    var SUBPIXELS_PER_PIXEL = 64;
     var enabled = undefined;
 
     function isEnabled()
@@ -17,10 +18,10 @@
     return {
         isEnabled: isEnabled,
         snapToLayoutUnit: function(f) {
-            return isEnabled() ? Math.floor(f * 64) / 64 : Math.floor(f); // as in LayoutUnit(f).toFloat()
+            return isEnabled() ? Math.floor(f * SUBPIXELS_PER_PIXEL) / SUBPIXELS_PER_PIXEL : Math.floor(f); // as in LayoutUnit(f).toFloat()
         },
         ceilSnapToLayoutUnit: function(f) {
-            return isEnabled() ? Math.ceil(f * 64) / 64 : Math.ceil(f); // see ceiledLayoutUnit(), LayoutUnit.h
+            return isEnabled() ? Math.ceil(f * SUBPIXELS_PER_PIXEL) / SUBPIXELS_PER_PIXEL : Math.ceil(f); // see ceiledLayoutUnit(), LayoutUnit.h
         }
     }
-}());
\ No newline at end of file
+}());

Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html (0 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html	                        (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>CSS RefTest Reference</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem">
+<style>
+.container {
+    width: 100px;
+    height: 75px;
+    font: 25px/1 Ahem;
+    line-height: 25px;
+    border: 10px solid black;
+    display: inline-block;
+}
+
+.left-text {
+    text-align: left;
+}
+
+.right-text {
+    text-align: right;
+}
+
+.left {
+    float: left;
+    width: 75px;
+    height: 50px;
+}
+
+.right {
+    float: right;
+    width: 75px;
+    height: 50px;
+}
+</style>
+</head>
+<body>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner of each.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+</body>

Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html (0 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html	                        (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>CSS Test: horizontal rectangle shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<link rel="match" href=""
+<meta name="flags" content="ahem">
+<script>
+// This is required to run the tests in WebKit's test infrastructure.
+if (window.internals)
+    window.internals.settings.setCSSShapesEnabled(true);
+</script>
+<style>
+.container {
+    width: 100px;
+    height: 75px;
+    font: 25px/1 Ahem;
+    line-height: 25px;
+    border: 10px solid black;
+    display: inline-block;
+}
+
+.left-text {
+    text-align: left;
+}
+
+.right-text {
+    text-align: right;
+}
+
+.left {
+    float: left;
+    width: 100px;
+    height: 75px;
+    -webkit-shape-outside: rectangle(0px, 0px, 75%, 66%);
+}
+
+.right {
+    float: right;
+    width: 100px;
+    height: 75px;
+    -webkit-shape-outside: rectangle(25%, 0px, 75%, 66%);
+}
+</style>
+<body>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner of each.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+</body>

Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html (0 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html	                        (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>CSS RefTest Reference</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem">
+<style>
+.container {
+    width: 100px;
+    height: 75px;
+    font: 25px/1 Ahem;
+    line-height: 25px;
+    border: 10px solid black;
+    display: inline-block;
+}
+
+.left-text {
+    text-align: left;
+}
+
+.right-text {
+    text-align: right;
+}
+
+.left {
+    float: left;
+    width: 75px;
+    height: 50px;
+}
+
+.right {
+    float: right;
+    width: 75px;
+    height: 50px;
+}
+</style>
+</head>
+<body>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner of each.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+</body>

Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html (0 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html	                        (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>CSS Test: horizontal rectangle shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<link rel="match" href=""
+<meta name="flags" content="ahem">
+<script>
+// This is required to run the tests in WebKit's test infrastructure.
+if (window.internals)
+    window.internals.settings.setCSSShapesEnabled(true);
+</script>
+<style>
+.container {
+    width: 100px;
+    height: 75px;
+    font: 25px/1 Ahem;
+    line-height: 25px;
+    border: 10px solid black;
+    display: inline-block;
+}
+
+.left-text {
+    text-align: left;
+}
+
+.right-text {
+    text-align: right;
+}
+
+.left {
+    float: left;
+    width: 100px;
+    height: 75px;
+    -webkit-shape-outside: rectangle(0px, 0px, 75%, 66%);
+}
+
+.right {
+    float: right;
+    width: 100px;
+    height: 75px;
+    -webkit-shape-outside: rectangle(25%, 0px, 75%, 66%);
+}
+</style>
+<body>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner of each.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        XXXX<br/>
+    </div>
+</body>

Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html (0 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html	                        (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<title>shape-outside-floats-inset-rectangle-000-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem">
+<head>
+    <style>
+        .test {
+            font: 20px/1 Ahem, sans-serif;
+            border: 1px solid black;
+            line-height: 20px;
+        }
+        .vertical-lr {
+            -webkit-writing-mode: vertical-lr;
+        }
+        .vertical-rl {
+            -webkit-writing-mode: vertical-rl;
+        }
+        .container {
+            width: 60px;
+            height: 60px;
+            display: inline-block;
+        }
+        .float {
+            width: 40px;
+            height: 40px;
+        }
+        .exclusion-top {
+            height: 20px;
+        }
+        .exclusion-right {
+            width: 20px;
+        }
+        .exclusion-bottom {
+            height: 20px;
+        }
+        .exclusion-left {
+            width: 20px;
+        }
+    </style>
+</head>
+<body>
+    <div class="test container">
+      XXX
+      <div style="float: left" class="float exclusion-top"></div>
+      X
+      XXX
+    </div>
+    <div class="test container">
+      XXX
+      <div style="float: right" class="float exclusion-top"></div>
+      X
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: left" class="float exclusion-right"></div>
+      XX
+      XX
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: left" class="float exclusion-bottom"></div>
+      X
+      XXX
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: right" class="float exclusion-bottom"></div>
+      X
+      XXX
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: right" class="float exclusion-left"></div>
+      XX
+      XX
+      XXX
+    </div>
+</body>

Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html (0 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html	                        (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<title>CSS Test: inset rectangle percentage shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<link rel="match" href=""
+<meta name="flags" content="ahem">
+<script>
+// This is required to run the tests in WebKit's test infrastructure.
+if (window.internals)
+    window.internals.settings.setCSSShapesEnabled(true);
+</script>
+<style>
+    .test {
+        font: 20px/1 Ahem, sans-serif;
+        border: 1px solid black;
+        line-height: 20px;
+    }
+    .container {
+        width: 60px;
+        height: 60px;
+        display: inline-block;
+    }
+    .float {
+        width: 40px;
+        height: 40px;
+    }
+    .exclusion-top {
+        -webkit-shape-outside: inset-rectangle(52%, 0, 0, 0);
+    }
+    .exclusion-right {
+        -webkit-shape-outside: inset-rectangle(0, 50%, 0, 0);
+    }
+    .exclusion-bottom {
+        -webkit-shape-outside: inset-rectangle(0, 0, 50%, 0);
+    }
+    .exclusion-left {
+        -webkit-shape-outside: inset-rectangle(0, 0, 0, 50%);
+    }
+</style>
+<body>
+    <div class="test container">
+      <div style="float: left" class="float exclusion-top"></div>
+      XXX
+      X
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: right" class="float exclusion-top"></div>
+      XXX
+      X
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: left" class="float exclusion-right"></div>
+      XX
+      XX
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: left" class="float exclusion-bottom"></div>
+      X
+      XXX
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: right" class="float exclusion-bottom"></div>
+      X
+      XXX
+      XXX
+    </div>
+    <div class="test container">
+      <div style="float: right" class="float exclusion-left"></div>
+      XX
+      XX
+      XXX
+    </div>
+</body>
+

Modified: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log (153436 => 153437)


--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log	2013-07-29 19:20:24 UTC (rev 153437)
@@ -8,7 +8,7 @@
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2013-07-25 9:12
+Last Import: 2013-07-26 15:53
 W3C Mercurial changeset: Not Available
 Test status at time of import: unknown
 ------------------------------------------------------------------------
@@ -55,5 +55,11 @@
 /LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html
 /LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html
 /LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html
 /LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js
 /LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js

Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage-expected.html (153436 => 153437)


--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage-expected.html	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage-expected.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style>
-        .test {
-            font: 10px/1 Ahem, sans-serif;
-            border: 1px solid black;
-        }
-        .vertical-lr {
-            -webkit-writing-mode: vertical-lr;
-        }
-        .vertical-rl {
-            -webkit-writing-mode: vertical-rl;
-        }
-        .container {
-            width: 30px;
-            height: 30px;
-            display: inline-block;
-        }
-        .float {
-            width: 20px;
-            height: 20px;
-        }
-        .exclusion-top {
-            height: 10px;
-        }
-        .exclusion-right {
-            width: 10px;
-        }
-        .exclusion-bottom {
-            height: 10px;
-        }
-        .exclusion-left {
-            width: 10px;
-        }
-    </style>
-</head>
-<body>
-    <h1><a href="" 116641</a> - [CSS Shapes] inset-rectangle support for shape-outside</h1>
-    <h2>The following tests all should have a white rectangle in one corner of a black square.</h2>
-    <h3>top offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-top"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-top"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <h3>right offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-right"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-right"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <h3>bottom offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-bottom"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-bottom"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <h3>left offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-left"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-left"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-</body>

Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html (153436 => 153437)


--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -1,193 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script>
-        if (window.internals)
-            window.internals.settings.setCSSShapesEnabled(true);
-    </script>
-    <style>
-        .test {
-            font: 10px/1 Ahem, sans-serif;
-            border: 1px solid black;
-        }
-        .vertical-lr {
-            -webkit-writing-mode: vertical-lr;
-        }
-        .vertical-rl {
-            -webkit-writing-mode: vertical-rl;
-        }
-        .container {
-            width: 30px;
-            height: 30px;
-            display: inline-block;
-        }
-        .float {
-            width: 20px;
-            height: 20px;
-        }
-        .exclusion-top {
-            -webkit-shape-outside: inset-rectangle(50%, 0, 0, 0);
-        }
-        .exclusion-right {
-            -webkit-shape-outside: inset-rectangle(0, 50%, 0, 0);
-        }
-        .exclusion-bottom {
-            -webkit-shape-outside: inset-rectangle(0, 0, 50%, 0);
-        }
-        .exclusion-left {
-            -webkit-shape-outside: inset-rectangle(0, 0, 0, 50%);
-        }
-    </style>
-</head>
-<body>
-    <h1><a href="" 116641</a> - [CSS Shapes] inset-rectangle support for shape-outside</h1>
-    <h2>The following tests all should have a white rectangle in one corner of a black square.</h2>
-    <h3>top offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-top"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-top"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-top"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <h3>right offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-right"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-right"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-right"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <h3>bottom offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-bottom"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-bottom"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-bottom"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <h3>left offset: left, right, left vertical-lr, right vertical-lr, left vertical-rl, right vertical-rl</h3>
-    <div class="test container">
-      <div style="float: left" class="float exclusion-left"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container">
-      <div style="float: right" class="float exclusion-left"></div>
-      XX
-      XX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: left" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-lr">
-      <div style="float: right" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: left" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-    <div class="test container vertical-rl">
-      <div style="float: right" class="float exclusion-left"></div>
-      X
-      XXX
-      XXX
-    </div>
-</body>

Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage-expected.html (153436 => 153437)


--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage-expected.html	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage-expected.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-    .container {
-        font: 10px/1 Ahem, sans-serif;
-        border: 1px solid black;
-    }
-    .container-smaller {
-        height: 40px;
-        width: 40px;
-    }
-    .container-horizontal-larger {
-        height: 40px;
-        width: 30px;
-    }
-    .container-vertical-larger {
-        height: 30px;
-        width: 40px;
-    }
-    .float-horizontal-smaller {
-        float: right;
-        height: 10px;
-        width: 20px;
-    }
-    .float-vertical-smaller {
-        float: right;
-        height: 20px;
-        width: 10px;
-    }
-    .float-horizontal-larger {
-        float: right;
-        height: 30px;
-        width: 20px;
-    }
-    .float-vertical-larger {
-        float: right;
-        height: 20px;
-        width: 30px;
-    }
-    .writing-mode-vertical-lr {
-        -webkit-writing-mode: vertical-lr;
-    }
-    .writing-mode-vertical-rl {
-        -webkit-writing-mode: vertical-rl;
-    }
-</style>
-</head>
-<body>
-    <h1><a href="" 100398</a>: [CSS Exclusions] shape-outside on floats for rectangle shapes height/width</h1>
-    <h2>These tests show that the shape outside works with shapes specified with percentages. Each rectangle below should have a smaller white rectangle on one corner.</h2>
-    <div class="container container-smaller">
-        <div class="float-horizontal-smaller"></div>
-        XX
-        XXXX
-        XXXX
-        XXXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-smaller writing-mode-vertical-lr">
-        <div class="float-vertical-smaller"></div>
-        XX
-        XXXX
-        XXXX
-        XXXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-smaller writing-mode-vertical-rl">
-        <div class="float-vertical-smaller"></div>
-        XX
-        XXXX
-        XXXX
-        XXXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-horizontal-larger">
-        <div class="float-horizontal-larger"></div>
-        X
-        X
-        X
-        XXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-vertical-larger writing-mode-vertical-lr">
-        <div class="float-vertical-larger"></div>
-        X
-        X
-        X
-        XXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-vertical-larger writing-mode-vertical-rl">
-        <div class="float-vertical-larger"></div>
-        X
-        X
-        X
-        XXX
-    </div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html (153436 => 153437)


--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html	2013-07-29 18:51:55 UTC (rev 153436)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html	2013-07-29 19:20:24 UTC (rev 153437)
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-</script>
-<style>
-    .container {
-        font: 10px/1 Ahem, sans-serif;
-        border: 1px solid black;
-    }
-    .container-smaller {
-        height: 40px;
-        width: 40px;
-    }
-    .container-horizontal-larger {
-        height: 40px;
-        width: 30px;
-    }
-    .container-vertical-larger {
-        height: 30px;
-        width: 40px;
-    }
-    .float-horizontal-smaller {
-        -webkit-shape-outside: rectangle(0px, 0px, 100%, 50%);
-        float: right;
-        height: 20px;
-        width: 20px;
-    }
-    .float-vertical-smaller {
-        -webkit-shape-outside: rectangle(0px, 0px, 50%, 100%);
-        float: right;
-        height: 50%
-        width: 50%
-    }
-    .float-horizontal-larger {
-        -webkit-shape-outside: rectangle(0px, 0px, 100%, 150%);
-        float: right;
-        height: 20px;
-        width: 20px;
-    }
-    .float-vertical-larger {
-        -webkit-shape-outside: rectangle(0px, 0px, 30px, 20px);
-        float: right;
-        height: 50%
-        width: 50%;
-    }
-    .writing-mode-vertical-lr {
-        -webkit-writing-mode: vertical-lr;
-    }
-    .writing-mode-vertical-rl {
-        -webkit-writing-mode: vertical-rl;
-    }
-</style>
-</head>
-<body>
-    <h1><a href="" 100398</a>: [CSS Exclusions] shape-outside on floats for rectangle shapes height/width</h1>
-    <h2>These tests show that the shape outside works with shapes specified with percentages. Each rectangle below should have a smaller white rectangle on one corner.</h2>
-    <div class="container container-smaller">
-        <div class="float-horizontal-smaller"></div>
-        XX
-        XXXX
-        XXXX
-        XXXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-smaller writing-mode-vertical-lr">
-        <div class="float-vertical-smaller"></div>
-        XX
-        XXXX
-        XXXX
-        XXXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-smaller writing-mode-vertical-rl">
-        <div class="float-vertical-smaller"></div>
-        XX
-        XXXX
-        XXXX
-        XXXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-horizontal-larger">
-        <div class="float-horizontal-larger"></div>
-        X
-        X
-        X
-        XXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-vertical-larger writing-mode-vertical-lr">
-        <div class="float-vertical-larger"></div>
-        X
-        X
-        X
-        XXX
-    </div>
-    <p>
-    </p>
-    <div class="container container-vertical-larger writing-mode-vertical-rl">
-        <div class="float-vertical-larger"></div>
-        X
-        X
-        X
-        XXX
-    </div>
-</body>
-</html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to