Diff
Modified: trunk/LayoutTests/ChangeLog (153385 => 153386)
--- trunk/LayoutTests/ChangeLog 2013-07-26 22:54:59 UTC (rev 153385)
+++ trunk/LayoutTests/ChangeLog 2013-07-26 23:00:24 UTC (rev 153386)
@@ -1,3 +1,25 @@
+2013-07-26 Bem Jones-Bey <[email protected]>
+
+ [CSS Shapes] New positioning model: support for polygon shape-outside
+ https://bugs.webkit.org/show_bug.cgi?id=118085
+
+ Reviewed by Dirk Schulze.
+
+ Update polygon tests to work for new positioning model and migrate
+ them to be W3C spec tests. Thus, they have been imported from the
+ CSSWG repository now.
+
+ * TestExpectations: Remove skip for replaced test.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html: Added.
+ * csswg/submitted/shapes/shape-outside/w3c-import.log:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon-expected.html: Removed.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html: Removed.
+
2013-07-26 Oliver Hunt <[email protected]>
REGRESSION(FTL?): Crashes in plugin tests
Modified: trunk/LayoutTests/TestExpectations (153385 => 153386)
--- trunk/LayoutTests/TestExpectations 2013-07-26 22:54:59 UTC (rev 153385)
+++ trunk/LayoutTests/TestExpectations 2013-07-26 23:00:24 UTC (rev 153386)
@@ -26,8 +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/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 ]
webkit.org/b/118086 fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html [ Skip ]
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html (0 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>shape-outside-floats-polygon-000-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+}
+.float-left {
+ height: 20px;
+ float: left;
+}
+.float-right {
+ height: 20px;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div style="width: 200px" class="float-left"></div>
+ XXXXXXXXXX
+ <div style="width: 180px" class="float-left"></div>
+ XXXXXXXXXXX
+ <div style="width: 160px" class="float-left"></div>
+ XXXXXXXXXXXX
+ <div style="width: 140px" class="float-left"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 120px" class="float-left"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-left"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-left"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-right"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-right"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 120px" class="float-right"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 140px" class="float-right"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 160px" class="float-right"></div>
+ XXXXXXXXXXXX
+ <div style="width: 180px" class="float-right"></div>
+ XXXXXXXXXXX
+ <div style="width: 200px" class="float-right"></div>
+ XXXXXXXXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html (0 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<title>CSS Test: polygon 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 {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+}
+.float-left {
+ width: 100px;
+ height: 200px;
+ -webkit-shape-outside: polygon(0px 0px, 200px 0px, 0px 200px);
+ float: left;
+}
+.float-right {
+ width: 100px;
+ height: 200px;
+ -webkit-shape-outside: polygon(100px 0px, -100px 200px, 100px 200px);
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div class="float-left"></div>
+ XXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXX
+ <div class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html (0 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>shape-outside-floats-polygon-000-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+}
+.float-left {
+ height: 20px;
+ float: left;
+}
+.float-right {
+ height: 20px;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div style="width: 200px" class="float-left"></div>
+ XXXXXXXXXX
+ <div style="width: 180px" class="float-left"></div>
+ XXXXXXXXXXX
+ <div style="width: 160px" class="float-left"></div>
+ XXXXXXXXXXXX
+ <div style="width: 140px" class="float-left"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 120px" class="float-left"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-left"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-left"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-right"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-right"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 120px" class="float-right"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 140px" class="float-right"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 160px" class="float-right"></div>
+ XXXXXXXXXXXX
+ <div style="width: 180px" class="float-right"></div>
+ XXXXXXXXXXX
+ <div style="width: 200px" class="float-right"></div>
+ XXXXXXXXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html (0 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>CSS Test: polygon 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 {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+ -webkit-writing-mode: vertical-lr;
+}
+.float-left {
+ width: 200px;
+ height: 100px;
+ -webkit-shape-outside: polygon(0px 0px, 0px 200px, 200px 0px);
+ float: left;
+}
+.float-right {
+ width: 200px;
+ height: 100px;
+ -webkit-shape-outside: polygon(0px 100px, 200px -100px, 200px 100px);
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div class="float-left"></div>
+ XXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXX
+ <div class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html (0 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>shape-outside-floats-polygon-002-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+}
+.float-left {
+ height: 20px;
+ float: left;
+}
+.float-right {
+ height: 20px;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div style="width: 200px" class="float-right"></div>
+ XXXXXXXXXX
+ <div style="width: 180px" class="float-right"></div>
+ XXXXXXXXXXX
+ <div style="width: 160px" class="float-right"></div>
+ XXXXXXXXXXXX
+ <div style="width: 140px" class="float-right"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 120px" class="float-right"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-right"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-right"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-left"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-left"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 120px" class="float-left"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 140px" class="float-left"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 160px" class="float-left"></div>
+ XXXXXXXXXXXX
+ <div style="width: 180px" class="float-left"></div>
+ XXXXXXXXXXX
+ <div style="width: 200px" class="float-left"></div>
+ XXXXXXXXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html (0 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>CSS Test: polygon 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 {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+ -webkit-writing-mode: vertical-rl;
+}
+.float-left {
+ width: 200px;
+ height: 100px;
+ -webkit-shape-outside: polygon(0px 0px, 200px 200px, 200px 0px);
+ float: left;
+}
+.float-right {
+ width: 200px;
+ height: 100px;
+ -webkit-shape-outside: polygon(0px 100px, 0px -100px, 200px 100px);
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div class="float-left"></div>
+ XXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXX
+ <div class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXX
+ </div>
+</body>
Modified: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log (153385 => 153386)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log 2013-07-26 22:54:59 UTC (rev 153385)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log 2013-07-26 23:00:24 UTC (rev 153386)
@@ -8,7 +8,7 @@
Do NOT modify or remove this file
------------------------------------------------------------------------
-Last Import: 2013-07-24 17:22
+Last Import: 2013-07-25 9:12
W3C Mercurial changeset: Not Available
Test status at time of import: unknown
------------------------------------------------------------------------
@@ -49,5 +49,11 @@
/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html
/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html
/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html
+/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/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-polygon-expected.html (153385 => 153386)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon-expected.html 2013-07-26 22:54:59 UTC (rev 153385)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon-expected.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.container {
- font: 10px/1 Ahem, sans-serif;
- width: 200px;
- height: 200px;
- background: blue;
-}
-.float-left {
- height: 10px;
- float: left;
-}
-.float-right {
- height: 10px;
- float: right;
-}
-.float-left-vertical {
- width: 10px;
- float: left;
-}
-.float-right-vertical {
- width: 10px;
- float: right;
-}
-</style>
-</head>
-<body>
- <h1><a href="" 98676</a> - [CSS Exclusions] shape-outside on floats for polygon shapes</h1>
- <h2>The following tests should display a square with blue triangles in opposite corners.</h2>
- <div class="container">
- <div style="width: 100px" class="float-left"></div>
- XXXXXXXXXX
- <div style="width: 90px" class="float-left"></div>
- XXXXXXXXXXX
- <div style="width: 80px" class="float-left"></div>
- XXXXXXXXXXXX
- <div style="width: 70px" class="float-left"></div>
- XXXXXXXXXXXXX
- <div style="width: 60px" class="float-left"></div>
- XXXXXXXXXXXXXX
- <div style="width: 50px" class="float-left"></div>
- XXXXXXXXXXXXXXX
- <div style="width: 40px" class="float-left"></div>
- XXXXXXXXXXXXXXXX
- <div style="width: 30px" class="float-left"></div>
- XXXXXXXXXXXXXXXXX
- <div style="width: 20px" class="float-left"></div>
- XXXXXXXXXXXXXXXXXX
- <div style="width: 10px" class="float-left"></div>
- XXXXXXXXXXXXXXXXXXX
- <div style="width: 10px" class="float-right"></div>
- XXXXXXXXXXXXXXXXXXX
- <div style="width: 20px" class="float-right"></div>
- XXXXXXXXXXXXXXXXXX
- <div style="width: 30px" class="float-right"></div>
- XXXXXXXXXXXXXXXXX
- <div style="width: 40px" class="float-right"></div>
- XXXXXXXXXXXXXXXX
- <div style="width: 50px" class="float-right"></div>
- XXXXXXXXXXXXXXX
- <div style="width: 60px" class="float-right"></div>
- XXXXXXXXXXXXXX
- <div style="width: 70px" class="float-right"></div>
- XXXXXXXXXXXXX
- <div style="width: 80px" class="float-right"></div>
- XXXXXXXXXXXX
- <div style="width: 90px" class="float-right"></div>
- XXXXXXXXXXX
- <div style="width: 100px" class="float-right"></div>
- XXXXXXXXXX
- </div>
- <h3>vertical lr</h3>
- <div style="-webkit-writing-mode: vertical-lr" class="container">
- <div style="height: 100px" class="float-left-vertical"></div>
- XXXXXXXXXX
- <div style="height: 90px" class="float-left-vertical"></div>
- XXXXXXXXXXX
- <div style="height: 80px" class="float-left-vertical"></div>
- XXXXXXXXXXXX
- <div style="height: 70px" class="float-left-vertical"></div>
- XXXXXXXXXXXXX
- <div style="height: 60px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXX
- <div style="height: 50px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXX
- <div style="height: 40px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXX
- <div style="height: 30px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXXX
- <div style="height: 20px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXXXX
- <div style="height: 10px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXXXXX
- <div style="height: 10px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXXXXX
- <div style="height: 20px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXXXX
- <div style="height: 30px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXXX
- <div style="height: 40px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXX
- <div style="height: 50px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXX
- <div style="height: 60px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXX
- <div style="height: 70px" class="float-right-vertical"></div>
- XXXXXXXXXXXXX
- <div style="height: 80px" class="float-right-vertical"></div>
- XXXXXXXXXXXX
- <div style="height: 90px" class="float-right-vertical"></div>
- XXXXXXXXXXX
- <div style="height: 100px" class="float-right-vertical"></div>
- XXXXXXXXXX
- </div>
- <h3>vertical rl</h3>
- <div style="-webkit-writing-mode: vertical-rl" class="container">
- <div style="height: 100px" class="float-left-vertical"></div>
- XXXXXXXXXX
- <div style="height: 90px" class="float-left-vertical"></div>
- XXXXXXXXXXX
- <div style="height: 80px" class="float-left-vertical"></div>
- XXXXXXXXXXXX
- <div style="height: 70px" class="float-left-vertical"></div>
- XXXXXXXXXXXXX
- <div style="height: 60px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXX
- <div style="height: 50px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXX
- <div style="height: 40px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXX
- <div style="height: 30px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXXX
- <div style="height: 20px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXXXX
- <div style="height: 10px" class="float-left-vertical"></div>
- XXXXXXXXXXXXXXXXXXX
- <div style="height: 10px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXXXXX
- <div style="height: 20px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXXXX
- <div style="height: 30px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXXX
- <div style="height: 40px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXXX
- <div style="height: 50px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXXX
- <div style="height: 60px" class="float-right-vertical"></div>
- XXXXXXXXXXXXXX
- <div style="height: 70px" class="float-right-vertical"></div>
- XXXXXXXXXXXXX
- <div style="height: 80px" class="float-right-vertical"></div>
- XXXXXXXXXXXX
- <div style="height: 90px" class="float-right-vertical"></div>
- XXXXXXXXXXX
- <div style="height: 100px" class="float-right-vertical"></div>
- XXXXXXXXXX
- </div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html (153385 => 153386)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html 2013-07-26 22:54:59 UTC (rev 153385)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html 2013-07-26 23:00:24 UTC (rev 153386)
@@ -1,131 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
- if (window.internals)
- window.internals.settings.setCSSShapesEnabled(true);
-</script>
-<style>
-.container {
- font: 10px/1 Ahem, sans-serif;
- width: 200px;
- height: 200px;
- background: blue;
-}
-.float-left {
- width: 50px;
- height: 100px;
- -webkit-shape-outside: polygon(0px 0px, 100px 0px, 0px 100px);
- float: left;
-}
-.float-right {
- width: 50px;
- height: 100px;
- -webkit-shape-outside: polygon(50px 0px, -50px 100px, 50px 100px);
- float: right;
-}
-.float-left-vertical-lr {
- width: 100px;
- height: 50px;
- -webkit-shape-outside: polygon(0px 0px, 0px 100px, 100px 0px);
- float: left;
-}
-.float-right-vertical-lr {
- width: 100px;
- height: 50px;
- -webkit-shape-outside: polygon(0px 50px, 100px -50px, 100px 50px);
- float: right;
-}
-.float-left-vertical-rl {
- width: 100px;
- height: 50px;
- -webkit-shape-outside: polygon(0px 0px, 100px 100px, 100px 0px);
- float: left;
-}
-.float-right-vertical-rl {
- width: 100px;
- height: 50px;
- -webkit-shape-outside: polygon(0px 50px, 0px -50px, 100px 50px);
- float: right;
-}
-</style>
-</head>
-<body>
- <h1><a href="" 98676</a> - [CSS Exclusions] shape-outside on floats for polygon shapes</h1>
- <h2>The following tests should display a square with blue triangles in opposite corners.</h2>
- <div class="container">
- <div class="float-left"></div>
- XXXXXXXXXX
- XXXXXXXXXXX
- XXXXXXXXXXXX
- XXXXXXXXXXXXX
- XXXXXXXXXXXXXX
- XXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXXX
- <div class="float-right"></div>
- XXXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXX
- XXXXXXXXXXXXXX
- XXXXXXXXXXXXX
- XXXXXXXXXXXX
- XXXXXXXXXXX
- XXXXXXXXXX
- </div>
- <h3>vertical lr</h3>
- <div style="-webkit-writing-mode: vertical-lr" class="container">
- <div class="float-left-vertical-lr"></div>
- XXXXXXXXXX
- XXXXXXXXXXX
- XXXXXXXXXXXX
- XXXXXXXXXXXXX
- XXXXXXXXXXXXXX
- XXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXXX
- <div class="float-right-vertical-lr"></div>
- XXXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXX
- XXXXXXXXXXXXXX
- XXXXXXXXXXXXX
- XXXXXXXXXXXX
- XXXXXXXXXXX
- XXXXXXXXXX
- </div>
- <h3>vertical rl</h3>
- <div style="-webkit-writing-mode: vertical-rl" class="container">
- <div class="float-left-vertical-rl"></div>
- XXXXXXXXXX
- XXXXXXXXXXX
- XXXXXXXXXXXX
- XXXXXXXXXXXXX
- XXXXXXXXXXXXXX
- XXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXXX
- <div class="float-right-vertical-rl"></div>
- XXXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXXX
- XXXXXXXXXXXXXXX
- XXXXXXXXXXXXXX
- XXXXXXXXXXXXX
- XXXXXXXXXXXX
- XXXXXXXXXXX
- XXXXXXXXXX
- </div>
-</body>
-</html>
