Index: LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html |
diff --git a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-polygon-015.html b/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html |
similarity index 59% |
copy from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-polygon-015.html |
copy to LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html |
index 9558f0e75fe1ab7587d8e4ff7627da2c2750f065..c0bdd0f000e8c51ca40e553a322d81049605c3ca 100644 |
--- a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-polygon-015.html |
+++ b/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html |
@@ -1,16 +1,15 @@ |
<!DOCTYPE html> |
<html> |
<head> |
- <title>CSS Test: right float, polygon + content-box + shape-margin</title> |
+ <title>CSS Test: left float, polygon, args in px units</title> |
<link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"> |
<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-polygon"> |
<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"> |
- <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#content-box"> |
- <link rel="match" href="reference/shape-outside-polygon-010-ref.html"> |
+ <link rel="match" href="reference/shape-outside-polygon-007-ref.html"> |
<meta name="flags" content="ahem" /> |
<meta name="assert" content="The test verifies that text wraps around a |
- right float with a shape-outside defined as |
- an polygon from the content box wtih a shape margin."> |
+ left float with a shape-outside defined as |
+ an polygon with the args in px units."> |
</head> |
<style> |
body { |
@@ -23,52 +22,44 @@ |
font-size: 20px; |
font-family: Ahem; |
line-height: 20px; |
- width: 240px; |
- height: 240px; |
+ width: 200px; |
+ height: 200px; |
background-color: red; |
color: green; |
} |
#test-shape { |
- float: right; |
+ float: left; |
width: 200px; |
height: 200px; |
- margin: 5px; |
- border: 10px solid transparent; |
- padding: 5px; |
- shape-margin: 20px; |
- shape-outside: content-box polygon(30% 20%, 100% 20%, 100% 80%, 60% 80%, 60% 70%, 80% 70%, 80% 40%, 30% 40%); |
+ shape-outside: polygon(0px 40px, 120px 40px, 120px 80px, 80px 80px, 80px 120px, 160px 120px, 160px 160px, 0px 160px); |
} |
.ref-shape { |
position: absolute; |
+ left: 10px; |
background-color: green; |
+ height: 40px; |
} |
#ref-1 { |
top: 90px; |
- left: 70px; |
- width: 180px; |
- height: 80px; |
+ width: 120px; |
} |
#ref-2 { |
- top: 170px; |
- left: 170px; |
+ top: 130px; |
width: 80px; |
- height: 20px; |
} |
#ref-3 { |
- top: 190px; |
- left: 130px; |
- width: 120px; |
- height: 60px; |
+ top: 170px; |
+ width: 160px; |
} |
</style> |
<body> |
<p>The test passes if there is green square and no red.</p> |
<div id="container"> |
<div id="test-shape"></div> |
- XXXXXXXXXXXX XXXXXXXXXXXX XXX XXX XXX XXX XXXXXXXX XXXXXX XXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXX |
+ XXXXXXXXXX XXXXXXXXXX XXXX XXXX XXXXXX XXXXXX XX XX XXXXXXXXXX XXXXXXXXXX |
</div> |
<div id="ref-1" class="ref-shape"></div> |
<div id="ref-2" class="ref-shape"></div> |
<div id="ref-3" class="ref-shape"></div> |
</body> |
-</html> |
+</html> |