Diff
Modified: trunk/LayoutTests/ChangeLog (153361 => 153362)
--- trunk/LayoutTests/ChangeLog 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/ChangeLog 2013-07-26 01:24:13 UTC (rev 153362)
@@ -1,3 +1,24 @@
+2013-07-25 Bem Jones-Bey <[email protected]>
+
+ [CSS Shapes] New positioning model: support for inset rectangle shape-outside
+ https://bugs.webkit.org/show_bug.cgi?id=118083
+
+ Reviewed by Dirk Schulze.
+
+ Update inset-rectangle tests to work with new positioning model.
+ Removed some test cases that aren't really needed or aren't applicable
+ with the new model. These test cases live in the CSS WG's repo now, so
+ they've been imported here.
+
+ * TestExpectations: Remove skip lines for replaced tests.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle-expected.html.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html.
+ * csswg/submitted/shapes/shape-outside/w3c-import.log:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-expected.html: Removed.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html: Removed.
+
2013-07-25 Zoltan Horvath <[email protected]>
[CSS Shapes] Add missing includes to shape-inside polygon tests
Modified: trunk/LayoutTests/TestExpectations (153361 => 153362)
--- trunk/LayoutTests/TestExpectations 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/TestExpectations 2013-07-26 01:24:13 UTC (rev 153362)
@@ -31,9 +31,6 @@
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/118083 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html [ Skip ]
-webkit.org/b/118083 fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.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 ]
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html (0 => 153362)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -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-000.html (0 => 153362)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<title>CSS Test: inset 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>
+ .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(21px, 0, 0, 0);
+ }
+ .exclusion-right {
+ -webkit-shape-outside: inset-rectangle(0, 20px, 0, 0);
+ }
+ .exclusion-bottom {
+ -webkit-shape-outside: inset-rectangle(0, 0, 20px, 0);
+ }
+ .exclusion-left {
+ -webkit-shape-outside: inset-rectangle(0, 0, 0, 20px);
+ }
+</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>
Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html (from rev 153361, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle-expected.html) (0 => 153362)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<title>shape-outside-floats-inset-rectangle-001-reference.html</title>
+<link rel="author" title="Bem Jones-Bey" href=""
+<meta name="flags" content="ahem dom">
+<style>
+.container {
+ position: relative;
+ font: 20px/1 Ahem, sans-serif;
+ width: 500px;
+ height: 200px;
+ border: 1px solid black;
+}
+
+.rounded-rect {
+ width: 320px;
+ height: 160px;
+ border-radius: 60px;
+ border: 1px solid blue;
+}
+
+#left-rounded-rect-outline {
+ position: absolute;
+ top: 20px;
+ left: 0px;
+}
+
+#right-rounded-rect-outline {
+ position: absolute;
+ top: 20px;
+ right: 0px;
+}
+
+.left-rounded-rect-float-line {
+ float: left;
+ clear: left;
+ height: 20px;
+}
+
+.right-rounded-rect-float-line {
+ float: right;
+ clear: right;
+ height: 20px;
+}
+</style>
+<body>
+<p>The black squares should trace the right side of the rounded rectangle's blue outline.</p>
+<div class="container">
+X<br/>
+ <div id="left-rounded-rect-outline" class="rounded-rect"></div>
+ <!-- generated left-rounded-rect-float-line divs will be inserted here -->
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X
+</div>
+
+<p>The black squares should trace the left side of the rounded rectangle's blue outline.</p>
+<div class="container" style="text-align: right">
+X<br/>
+ <div id="right-rounded-rect-outline" class="rounded-rect"></div>
+ <!-- generated right-rounded-rect-float-line divs will be inserted here -->
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X
+</div>
+<script src=""
+<script src=""
+<script>
+genLeftRightRoundedRectFloatShapeOutsideRefTest({
+ roundedRect: {x: 0, y: 20, width: 321, height: 160, rx: 60, ry: 60},
+ containerWidth: 500,
+ containerHeight: 200,
+ lineHeight: 20,
+ floatElementClassSuffix: "rounded-rect-float-line",
+ insertElementIdSuffix: "rounded-rect-outline"
+});
+</script>
+</body>
Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html (from rev 153361, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html) (0 => 153362)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<title>CSS Test: inset 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 {
+ font: 20px/1 Ahem, sans-serif;
+ width: 500px;
+ height: 200px;
+ border: 1px solid black;
+}
+
+.rounded-rect {
+ width: 320px;
+ height: 160px;
+ border: 1px solid blue;
+ border-radius: 60px;
+ -webkit-shape-outside: inset-rectangle(0px, 0px, 0px, 0px, 60px, 60px); /* top,right,bottom,left,rx,ry */
+}
+</style>
+<body>
+<p>The black squares should trace the right side of the rounded rectangle's blue outline.</p>
+<div class="container">
+X<br/>
+ <div style="float: left" class="rounded-rect"></div>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X
+</div>
+
+<p>The black squares should trace the left side of the rounded rectangle's blue outline.</p>
+<div class="container" style="text-align: right">
+X<br/>
+ <div style="float: right" class="rounded-rect"></div>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X<br/>
+X
+</div>
+</body>
Modified: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log (153361 => 153362)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log 2013-07-26 01:24:13 UTC (rev 153362)
@@ -45,5 +45,9 @@
/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/shape-outside-floats-inset-rectangle-000-expected.html
+/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/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-expected.html (153361 => 153362)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-expected.html 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-expected.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -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.html (153361 => 153362)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -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(10px, 0, 0, 0);
- }
- .exclusion-right {
- -webkit-shape-outside: inset-rectangle(0, 10px, 0, 0);
- }
- .exclusion-bottom {
- -webkit-shape-outside: inset-rectangle(0, 0, 10px, 0);
- }
- .exclusion-left {
- -webkit-shape-outside: inset-rectangle(0, 0, 0, 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-rounded-inset-rectangle-expected.html (153361 => 153362)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle-expected.html 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle-expected.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.container {
- position: relative;
- font: 20px/1 Ahem, sans-serif;
- width: 500px;
- height: 200px;
- border: 1px solid black;
-}
-
-.rounded-rect {
- width: 320px;
- height: 160px;
- border-radius: 60px;
- border: 1px solid blue;
- margin: -1px; /* shape-outside layout is unaffected by the border */
-}
-
-#left-rounded-rect-outline {
- position: absolute;
- top: 20px;
- left: 0px;
-}
-
-#right-rounded-rect-outline {
- position: absolute;
- top: 20px;
- left: 180px;
-}
-
-.left-rounded-rect-float-line {
- float: left;
- clear: left;
- height: 20px;
-}
-
-.right-rounded-rect-float-line {
- float: right;
- clear: right;
- height: 20px;
-}
-</style>
-
-<h1><a href="" 116641</a> - [CSS Shapes] inset-rectangle support for shape-outside</h1>
-<p>The black squares should trace the right side of the rounded rectangle's blue outline.</p>
-<div class="container">
-X<br/>
- <div id="left-rounded-rect-outline" class="rounded-rect"></div>
- <!-- generated left-rounded-rect-float-line divs will be inserted here -->
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X
-</div>
-
-<p>The black squares should trace the left side of the rounded rectangle's blue outline.</p>
-<div class="container" style="text-align: right">
-X<br/>
- <div id="right-rounded-rect-outline" class="rounded-rect"></div>
- <!-- generated right-rounded-rect-float-line divs will be inserted here -->
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X
-</div>
-</body>
-
-<script src=""
-<script src=""
-<script>
-genLeftRightRoundedRectFloatShapeOutsideRefTest({
- roundedRect: {x: 0, y: 20, width: 320, height: 160, rx: 60, ry: 60},
- containerWidth: 500,
- containerHeight: 200,
- lineHeight: 20,
- floatElementClassSuffix: "rounded-rect-float-line",
- insertElementIdSuffix: "rounded-rect-outline"
-});
-</script>
-
-</html>
-
-
Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html (153361 => 153362)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html 2013-07-26 00:40:29 UTC (rev 153361)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html 2013-07-26 01:24:13 UTC (rev 153362)
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
- if (window.internals)
- window.internals.settings.setCSSShapesEnabled(true);
-</script>
-<style>
-.container {
- font: 20px/1 Ahem, sans-serif;
- width: 500px;
- height: 200px;
- border: 1px solid black;
-}
-
-.rounded-rect {
- width: 320px;
- height: 160px;
- border: 1px solid blue;
- border-radius: 60px;
- -webkit-shape-outside: inset-rectangle(0px, 0px, 0px, 0px, 60px, 60px); /* top,right,bottom,left,rx,ry */
-}
-</style>
-
-<h1><a href="" 116641</a> - [CSS Shapes] inset-rectangle support for shape-outside</h1>
-<p>The black squares should trace the right side of the rounded rectangle's blue outline.</p>
-<div class="container">
-X<br/>
- <div style="float: left" class="rounded-rect"></div>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X
-</div>
-
-<p>The black squares should trace the left side of the rounded rectangle's blue outline.</p>
-<div class="container" style="text-align: right">
-X<br/>
- <div style="float: right" class="rounded-rect"></div>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X<br/>
-X
-</div>
-</body>
-</html>
-
-
