[CSS Shapes] Stop using internals in shape-outside tests
authorbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 31 Jul 2013 18:18:37 +0000 (18:18 +0000)
committerbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 31 Jul 2013 18:18:37 +0000 (18:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=119229

Reviewed by Alexandru Chiculita.

We no longer need to use window.internals for shape-outside, since it
is enabled by default on ports where it is compiled in. To make the
w3c spec test cleaner, that reference has been removed from all of the
tests.

* csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html:
* csswg/submitted/shapes/shape-outside/w3c-import.log:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

27 files changed:
LayoutTests/ChangeLog
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.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.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.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html
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.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html
LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html
LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log

index b78a374..3ced54c 100644 (file)
@@ -1,3 +1,42 @@
+2013-07-31  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Shapes] Stop using internals in shape-outside tests
+        https://bugs.webkit.org/show_bug.cgi?id=119229
+
+        Reviewed by Alexandru Chiculita.
+
+        We no longer need to use window.internals for shape-outside, since it
+        is enabled by default on ports where it is compiled in. To make the
+        w3c spec test cleaner, that reference has been removed from all of the
+        tests.
+
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html:
+        * csswg/submitted/shapes/shape-outside/w3c-import.log:
+
 2013-07-31  Ryosuke Niwa  <rniwa@webkit.org>
 
         Test assignment to indexed window properties
index a10eafa..d6d39ba 100644 (file)
@@ -2,13 +2,8 @@
 <title>CSS Test: circle 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-circle-000-reference.html">
+<link rel="match" href="shape-outside-floats-circle-000-ref.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;
index 8ab3b3c..03c3768 100644 (file)
@@ -1,18 +1,11 @@
 <!DOCTYPE html>
-<title>
- CSS Test: horizontal rectangle 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-horizontal-rectangle-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>
+<title>CSS Test: horizontal rectangle shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-horizontal-rectangle-000-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 100px;
     height: 75px;
     font: 25px/1 Ahem;
@@ -33,38 +26,29 @@ if (window.internals)
     float: left;
     width: 100px;
     height: 75px;
-   -webkit-shape-outside: rectangle(0px, 0px, 75px, 50px);
+    -webkit-shape-outside: rectangle(0px, 0px, 75px, 50px);
 }
 
 .right {
     float: right;
     width: 100px;
     height: 75px;
-   -webkit-shape-outside: rectangle(25px, 0px, 75px, 50px);
+    -webkit-shape-outside: rectangle(25px, 0px, 75px, 50px);
 }
 </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>
+    <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>
index e740cc1..62f551a 100644 (file)
@@ -1,18 +1,16 @@
 <!DOCTYPE html>
-<title>
- CSS RefTest Reference
-</title>
-<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com" />
-<meta name="flags" content="ahem" />
+<title>CSS RefTest Reference</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 100px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
 }
 
 .left-text {
     height: 75px;
 }
 </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>
+    <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>
index 0770f7a..4e7419b 100644 (file)
@@ -1,25 +1,18 @@
 <!DOCTYPE html>
-<title>
- CSS Test: horizontal rectangle shape-outside on floats, vertical-lr writing mode
-</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-horizontal-rectangle-001-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>
+<title>CSS Test: horizontal rectangle shape-outside on floats, vertical-lr writing mode</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-horizontal-rectangle-001-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 100px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
 }
 
 .left-text {
@@ -34,38 +27,30 @@ if (window.internals)
     float: left;
     width: 75px;
     height: 100px;
-   -webkit-shape-outside: rectangle(0px, 0px, 50px, 75px);
+    -webkit-shape-outside: rectangle(0px, 0px, 50px, 75px);
 }
 
 .right {
     float: right;
     width: 75px;
     height: 100px;
-   -webkit-shape-outside: rectangle(0px, 25px, 50px, 75px);
+    -webkit-shape-outside: rectangle(0px, 25px, 50px, 75px);
 }
 </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>
+    <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>
index 9a9638d..17f8c16 100644 (file)
@@ -1,18 +1,16 @@
 <!DOCTYPE html>
-<title>
- CSS RefTest Reference
-</title>
-<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com" />
-<meta name="flags" content="ahem" />
+<title>CSS RefTest Reference</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 100px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-rl;
+    -webkit-writing-mode: vertical-rl;
 }
 
 .left-text {
     height: 75px;
 }
 </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>
+    <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>
index dd7fda8..761382f 100644 (file)
@@ -1,25 +1,18 @@
 <!DOCTYPE html>
-<title>
- CSS Test: horizontal rectangle shape-outside on floats, vertical-rl writing mode
-</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-horizontal-rectangle-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>
+<title>CSS Test: horizontal rectangle shape-outside on floats, vertical-rl writing mode</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-horizontal-rectangle-002-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 100px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-rl;
+    -webkit-writing-mode: vertical-rl;
 }
 
 .left-text {
@@ -34,38 +27,30 @@ if (window.internals)
     float: left;
     width: 75px;
     height: 100px;
-   -webkit-shape-outside: rectangle(25px, 0px, 50px, 75px);
+    -webkit-shape-outside: rectangle(25px, 0px, 50px, 75px);
 }
 
 .right {
     float: right;
     width: 75px;
     height: 100px;
-   -webkit-shape-outside: rectangle(25px, 25px, 50px, 75px);
+    -webkit-shape-outside: rectangle(25px, 25px, 50px, 75px);
 }
 </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>
+    <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>
index fb927a8..ef9bd02 100644 (file)
@@ -4,11 +4,6 @@
 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-horizontal-rectangle-000-ref.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 {
     width: 100px;
@@ -29,15 +24,15 @@ if (window.internals)
 
 .left {
     float: left;
-    width: 100px;
-    height: 75px;
+    width: 100%;
+    height: 100%;
     -webkit-shape-outside: rectangle(0px, 0px, 75%, 66%);
 }
 
 .right {
     float: right;
-    width: 100px;
-    height: 75px;
+    width: 100%;
+    height: 100%;
     -webkit-shape-outside: rectangle(25%, 0px, 75%, 66%);
 }
 </style>
index fb927a8..83e3a9f 100644 (file)
@@ -4,11 +4,6 @@
 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-horizontal-rectangle-000-ref.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 {
     width: 100px;
index 31d5d53..771fe1c 100644 (file)
@@ -2,13 +2,8 @@
 <title>CSS Test: inset rectangle 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-inset-rectangle-000-reference.html">
+<link rel="match" href="shape-outside-floats-inset-rectangle-000-ref.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>
     .test {
         font: 20px/1 Ahem, sans-serif;
index db53310..9a6e6d6 100644 (file)
@@ -2,13 +2,8 @@
 <title>CSS Test: inset rectangle 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-inset-rectangle-001-reference.html">
+<link rel="match" href="shape-outside-floats-inset-rectangle-001-ref.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;
index 74298be..625530a 100644 (file)
@@ -4,11 +4,6 @@
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-inset-rectangle-000-ref.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>
     .test {
         font: 20px/1 Ahem, sans-serif;
index c63e3f8..4d723c4 100644 (file)
@@ -2,13 +2,8 @@
 <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">
+<link rel="match" href="shape-outside-floats-polygon-000-ref.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;
index 197b398..0046a4c 100644 (file)
@@ -2,13 +2,8 @@
 <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">
+<link rel="match" href="shape-outside-floats-polygon-000-ref.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;
index 96561bc..d8b6205 100644 (file)
@@ -2,13 +2,8 @@
 <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">
+<link rel="match" href="shape-outside-floats-polygon-002-ref.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;
index 0c4cd09..8b3b747 100644 (file)
@@ -1,13 +1,9 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-001.html</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-rounded-rectangle-001-reference.html">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-rounded-rectangle-001-ref.html">
 <meta name="flags" content="ahem">
-<script>
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-</script>
 <style>
 .container {
     font: 20px/1 Ahem, sans-serif;
index 0906467..5dd7025 100644 (file)
@@ -1,13 +1,9 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-002.html</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-rounded-rectangle-002-reference.html">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-rounded-rectangle-002-ref.html">
 <meta name="flags" content="ahem">
-<script>
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-</script>
 <style>
 .container {
     font: 20px/1 Ahem, sans-serif;
index 1a91320..f4ffa6d 100644 (file)
@@ -1,13 +1,9 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-003.html</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-rounded-rectangle-003-reference.html">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-rounded-rectangle-003-ref.html">
 <meta name="flags" content="ahem">
-<script>
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-</script>
 <style>
 .container {
     font: 20px/1 Ahem, sans-serif;
index 45d0a74..6feec2c 100644 (file)
@@ -1,14 +1,9 @@
 <!DOCTYPE html>
 <title>CSS Test: rounded rectangle shape-outside on floats with clamped radii values</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-rounded-rectangle-004-reference.html">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-rounded-rectangle-004-ref.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: 10px/1 Ahem, sans-serif;
index 6b8c1b1..ed27adf 100644 (file)
@@ -1,18 +1,11 @@
 <!DOCTYPE html>
-<title>
- CSS Test: square 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-square-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>
+<title>CSS Test: square shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-square-000-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 75px;
     font: 25px/1 Ahem;
@@ -33,38 +26,30 @@ if (window.internals)
     float: left;
     width: 75px;
     height: 75px;
-   -webkit-shape-outside: rectangle(0px, 0px, 50px, 50px);
+    -webkit-shape-outside: rectangle(0px, 0px, 50px, 50px);
 }
 
 .right {
     float: right;
     width: 75px;
     height: 75px;
-   -webkit-shape-outside: rectangle(25px, 0px, 50px, 50px);
+    -webkit-shape-outside: rectangle(25px, 0px, 50px, 50px);
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black square boxes with a smaller white square in one corner.
- </p>
- <div class="container left-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container right-text">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black square boxes with a smaller white square in one corner.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index 0417a86..0150c93 100644 (file)
@@ -1,18 +1,11 @@
 <!DOCTYPE html>
-<title>
- CSS Test: square shape-outside on floats with a border
-</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-square-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>
+<title>CSS Test: square shape-outside on floats with a border</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-square-000-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 75px;
     font: 25px/1 Ahem;
@@ -32,7 +25,7 @@ if (window.internals)
     border: 10px solid black;
     margin-top: -10px;
     margin-left: -10px;
-   -webkit-shape-outside: rectangle(0px, 0px, 50px, 50px);
+    -webkit-shape-outside: rectangle(0px, 0px, 50px, 50px);
 }
 
 .right {
@@ -42,31 +35,23 @@ if (window.internals)
     border: 10px solid black;
     margin-top: -10px;
     margin-right: -10px;
-   -webkit-shape-outside: rectangle(25px, 0px, 50px, 50px);
+    -webkit-shape-outside: rectangle(25px, 0px, 50px, 50px);
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black square boxes with a smaller white square in one corner.
- </p>
- <div class="container right-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black square boxes with a smaller white square in one corner.</p>
+    <div class="container right-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index 4ad97ee..3cc69b4 100644 (file)
@@ -1,18 +1,11 @@
 <!DOCTYPE html>
-<title>
- CSS Test: vertical rectangle 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-vertical-rectangle-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>
+<title>CSS Test: vertical rectangle shape-outside on floats</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-vertical-rectangle-000-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 75px;
     height: 100px;
     font: 25px/1 Ahem;
@@ -33,42 +26,32 @@ if (window.internals)
     float: left;
     width: 75px;
     height: 100px;
-   -webkit-shape-outside: rectangle(0px, 0px, 50px, 75px);
+    -webkit-shape-outside: rectangle(0px, 0px, 50px, 75px);
 }
 
 .right {
     float: right;
     width: 75px;
     height: 100px;
-   -webkit-shape-outside: rectangle(25px, 0px, 50px, 75px);
+    -webkit-shape-outside: rectangle(25px, 0px, 50px, 75px);
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.
- </p>
- <div class="container left-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container right-text">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index c5b6945..a6215a9 100644 (file)
@@ -1,18 +1,16 @@
 <!DOCTYPE html>
-<title>
- CSS RefTest Reference
-</title>
-<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com" />
-<meta name="flags" content="ahem" />
+<title>CSS RefTest Reference</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 100px;
     height: 75px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
 }
 
 .left-text {
     height: 50px;
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.
- </p>
- <div class="container left-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container right-text">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index 01684c7..2d29ced 100644 (file)
@@ -1,25 +1,18 @@
 <!DOCTYPE html>
-<title>
- CSS Test: vertical rectangle shape-outside on floats, vertical-lr writing mode
-</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-vertical-rectangle-001-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>
+<title>CSS Test: vertical rectangle shape-outside on floats, vertical-lr writing mode</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-vertical-rectangle-001-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 100px;
     height: 75px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
 }
 
 .left-text {
@@ -34,42 +27,32 @@ if (window.internals)
     float: left;
     width: 100px;
     height: 75px;
-   -webkit-shape-outside: rectangle(0px, 0px, 75px, 50px);
+    -webkit-shape-outside: rectangle(0px, 0px, 75px, 50px);
 }
 
 .right {
     float: right;
     width: 100px;
     height: 75px;
-   -webkit-shape-outside: rectangle(0px, 25px, 75px, 50px);
+    -webkit-shape-outside: rectangle(0px, 25px, 75px, 50px);
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.
- </p>
- <div class="container left-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container right-text">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index cdb047b..7239667 100644 (file)
@@ -1,18 +1,16 @@
 <!DOCTYPE html>
-<title>
- CSS RefTest Reference
-</title>
-<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com" />
-<meta name="flags" content="ahem" />
+<title>CSS RefTest Reference</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 100px;
     height: 75px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-rl;
+    -webkit-writing-mode: vertical-rl;
 }
 
 .left-text {
     height: 50px;
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.
- </p>
- <div class="container left-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container right-text">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index ee1d70f..f4939fb 100644 (file)
@@ -1,25 +1,18 @@
 <!DOCTYPE html>
-<title>
- CSS Test: vertical rectangle shape-outside on floats, vertical-rl writing mode
-</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-vertical-rectangle-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>
+<title>CSS Test: vertical rectangle shape-outside on floats, vertical-rl writing mode</title>
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-vertical-rectangle-002-ref.html">
+<meta name="flags" content="ahem">
 <style>
- .container {
+.container {
     width: 100px;
     height: 75px;
     font: 25px/1 Ahem;
     line-height: 25px;
     border: 10px solid black;
     display: inline-block;
-   -webkit-writing-mode: vertical-rl;
+    -webkit-writing-mode: vertical-rl;
 }
 
 .left-text {
@@ -34,42 +27,32 @@ if (window.internals)
     float: left;
     width: 100px;
     height: 75px;
-   -webkit-shape-outside: rectangle(25px, 0px, 75px, 50px);
+    -webkit-shape-outside: rectangle(25px, 0px, 75px, 50px);
 }
 
 .right {
     float: right;
     width: 100px;
     height: 75px;
-   -webkit-shape-outside: rectangle(25px, 25px, 75px, 50px);
+    -webkit-shape-outside: rectangle(25px, 25px, 75px, 50px);
 }
 </style>
+</head>
 <body>
- <p>
-  Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.
- </p>
- <div class="container left-text">
-  <div class="left">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
- <div class="container right-text">
-  <div class="right">
-  </div>
-  X
-  <br />
-  X
-  <br />
-  X
-  <br />
-  XXX
-  <br />
- </div>
+    <p>Test passes if you see two black rectangle boxes with a smaller white rectangle in one corner.</p>
+    <div class="container left-text">
+        <div class="left"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
+
+    <div class="container right-text">
+        <div class="right"></div>
+        X<br/>
+        X<br/>
+        X<br/>
+        XXX<br/>
+    </div>
 </body>
index 8514631..e135990 100644 (file)
@@ -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-26 15:53
+Last Import: 2013-07-29 16:10
 W3C Mercurial changeset: Not Available
 Test status at time of import: unknown
 ------------------------------------------------------------------------