WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-118085-20130725095726.patch (text/plain), 27.31 KB, created by
Bem Jones-Bey
on 2013-07-25 09:57:24 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Bem Jones-Bey
Created:
2013-07-25 09:57:24 PDT
Size:
27.31 KB
patch
obsolete
>Subversion Revision: 153091 >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 6514ec9f7a27c4c48462cc3ea7350865dc14251b..52c25014e81cc57d53c9da58e24bafb9a57082cf 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,25 @@ >+2013-07-25 Bem Jones-Bey <bjonesbe@adobe.com> >+ >+ [CSS Shapes] New positioning model: support for polygon shape-outside >+ https://bugs.webkit.org/show_bug.cgi?id=118085 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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-24 Robert Hogan <robert@webkit.org> > > Border drawing incorrect when using both border-collapse: collapse and overflow: hidden on a table >diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations >index 100a5802b9b11cb061caeab9648137b0d089ad27..940d3ae19f8e071a8266eb6bbbf178c08d9903bb 100644 >--- a/LayoutTests/TestExpectations >+++ b/LayoutTests/TestExpectations >@@ -29,8 +29,6 @@ webkit.org/b/118088 fast/shapes/shape-outside-floats/shape-outside-floats-right- > 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 ] > webkit.org/b/118086 fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html [ Skip ] > >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html >new file mode 100644 >index 0000000000000000000000000000000000000000..7990de2e450e9f5a665f7cbdc0ad42b25d10813d >--- /dev/null >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html >@@ -0,0 +1,65 @@ >+<!DOCTYPE html> >+<title>shape-outside-floats-polygon-000-reference.html</title> >+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"> >+<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> >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html >new file mode 100644 >index 0000000000000000000000000000000000000000..c63e3f87b21601d0ed3cedcae944aad4f9a03d66 >--- /dev/null >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html >@@ -0,0 +1,58 @@ >+<!DOCTYPE html> >+<title>CSS Test: polygon 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-polygon-000-reference.html"> >+<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> >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html >new file mode 100644 >index 0000000000000000000000000000000000000000..7990de2e450e9f5a665f7cbdc0ad42b25d10813d >--- /dev/null >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html >@@ -0,0 +1,65 @@ >+<!DOCTYPE html> >+<title>shape-outside-floats-polygon-000-reference.html</title> >+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"> >+<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> >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html >new file mode 100644 >index 0000000000000000000000000000000000000000..197b398a1c96c6b86962ca7483a78f0cb2f6d9c0 >--- /dev/null >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html >@@ -0,0 +1,59 @@ >+<!DOCTYPE html> >+<title>CSS Test: polygon 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-polygon-000-reference.html"> >+<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> >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html >new file mode 100644 >index 0000000000000000000000000000000000000000..52ccc9abded9afbf0d156fc200691541e8fc1349 >--- /dev/null >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html >@@ -0,0 +1,65 @@ >+<!DOCTYPE html> >+<title>shape-outside-floats-polygon-002-reference.html</title> >+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"> >+<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> >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html >new file mode 100644 >index 0000000000000000000000000000000000000000..96561bc37021aa3f93b322328fb56e763202bff4 >--- /dev/null >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html >@@ -0,0 +1,59 @@ >+<!DOCTYPE html> >+<title>CSS Test: polygon 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-polygon-002-reference.html"> >+<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> >diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log b/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log >index 46097ad38d1507b1350180bef0af2e29516ba409..7fe23bb213f23f4107de4413e46d722177468810 100644 >--- a/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log >+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log >@@ -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-25 9:12 > W3C Mercurial changeset: Not Available > Test status at time of import: unknown > ------------------------------------------------------------------------ >@@ -41,5 +41,11 @@ 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-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 >diff --git a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon-expected.html b/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon-expected.html >deleted file mode 100644 >index ec3d35177b8a709353abeb248a3a04104d204807..0000000000000000000000000000000000000000 >--- a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon-expected.html >+++ /dev/null >@@ -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="https://bugs.webkit.org/show_bug.cgi?id=98676">Bug 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> >diff --git a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html b/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html >deleted file mode 100644 >index 0176ce12ae3240e1477e2f581e60d5bd0561fc4b..0000000000000000000000000000000000000000 >--- a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-polygon.html >+++ /dev/null >@@ -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="https://bugs.webkit.org/show_bug.cgi?id=98676">Bug 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>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 118085
:
207465
|
207476
|
207533
|
207541