[css shapes] Pull in upstream fixes to shape-outside margin and clipping tests
authorbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Nov 2013 18:17:51 +0000 (18:17 +0000)
committerbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Nov 2013 18:17:51 +0000 (18:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=123588

Reviewed by Alexandru Chiculita.

Fix some typos in the tests, add better explanation, and generally
make the tests clearer.

* csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021-expected.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html:
* csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log:

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

54 files changed:
LayoutTests/ChangeLog
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021-expected.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html
LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log

index c53c863..23f0119 100644 (file)
@@ -1,3 +1,67 @@
+2013-11-01  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [css shapes] Pull in upstream fixes to shape-outside margin and clipping tests
+        https://bugs.webkit.org/show_bug.cgi?id=123588
+
+        Reviewed by Alexandru Chiculita.
+
+        Fix some typos in the tests, add better explanation, and generally
+        make the tests clearer.
+
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021-expected.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html:
+        * csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log:
+
 2013-11-01  Brendan Long  <b.long@cablelabs.com>
 
         [GStreamer] Support audio and video tracks
index d3e5d2d..9248818 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-10-21 12:29
+Last Import: 2013-10-31 13:25
 W3C Mercurial changeset: Not Available
 Test status at time of import: unknown
 ------------------------------------------------------------------------
index bcb1ab0..8990f1b 100644 (file)
@@ -3,7 +3,6 @@
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
-<link rel="match" href="shape-outside-floats-clipped-001-ref.html">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -40,7 +39,7 @@
 </style>
 
 <body>
-    <p>This should display two squares containing a green stripe, a blue strupe, and a black rectangle, in that order.</p>
+    <p>This should display two squares containing a green stripe, a blue stripe, and a black rectangle, in that order.</p>
     <div class="container">
         <div id="float-left"></div>
         XX
index d73717c..bb3a4b5 100644 (file)
@@ -38,7 +38,7 @@
 </style>
 
 <body>
-    <p>This should display two squares containing a green stripe, a blue strupe, and a black rectangle, in that order.</p>
+    <p>This should display two squares containing a green stripe, a blue stripe, and a black rectangle, in that order.</p>
     <div class="container">
         <div id="float-left"></div>
         XX
index bcb1ab0..8990f1b 100644 (file)
@@ -3,7 +3,6 @@
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
-<link rel="match" href="shape-outside-floats-clipped-001-ref.html">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -40,7 +39,7 @@
 </style>
 
 <body>
-    <p>This should display two squares containing a green stripe, a blue strupe, and a black rectangle, in that order.</p>
+    <p>This should display two squares containing a green stripe, a blue stripe, and a black rectangle, in that order.</p>
     <div class="container">
         <div id="float-left"></div>
         XX
index 3843760..9ceeffd 100644 (file)
@@ -38,7 +38,7 @@
 </style>
 
 <body>
-    <p>This should display two squares containing a green stripe, a blue strupe, and a black rectangle, in that order.</p>
+    <p>This should display two squares containing a green stripe, a blue stripe, and a black rectangle, in that order.</p>
     <div class="container">
         <div id="float-left"></div>
         XX
index 7c9b1fc..01213a3 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats shape clipped to left and right of margin box</title>
+<title>CSS Test: shape-outside on floats shape clipped to left and right of margin box with 0 margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
index 44f86c8..6fe8f4c 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats shape clipped to left and right of margin box</title>
+<title>CSS Test: shape-outside on floats shape clipped to left and right of margin box, positive margin on outside edge of float</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
index 10d4ad6..cf8a382 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats shape clipped to left and right of margin box</title>
+<title>CSS Test: shape-outside on floats shape clipped to left and right of margin box, positive margin on inside edge of float</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
index c37fc73..793033b 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 346643b..0d9690a 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a positive margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the same logical side as the float direction (eg: left margin on left float) is properly ignored in the case of a zero extent shape.">
 <link rel="match" href="shape-outside-floats-margin-000-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -35,7 +36,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 25c9125..9796116 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
index ab57820..e74ab16 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a positive top margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the logical top side of a float does not affect inline content wrapping around the shape.">
 <link rel="match" href="shape-outside-floats-margin-001-ref.html">
 <meta name="flags" content="ahem">
 <head>
index 25c9125..9796116 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
index 99c6d7a..50a34cc 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a positive bottom margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the logical bottom side of a float does not affect inline content wrapping around the shape.">
 <link rel="match" href="shape-outside-floats-margin-001-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -22,7 +23,7 @@
     float: left;
     width: 100px;
     height: 20px;
-    -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
+    -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
     margin-bottom: 20px;
     background-color: green;
 }
@@ -31,7 +32,7 @@
     float: right;
     width: 100px;
     height: 20px;
-    -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
+    -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
     margin-bottom: 20px;
     background-color: green;
 }
index 6aba2ce..822f22b 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
index d9403d6..4e8cfeb 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a positive bottom margin</title>
+<title>CSS Test: shape-outside on floats with a positive bottom and top margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if positive margins on the logical top and bottom sides of a float does not affect inline content wrapping around the shape.">
 <link rel="match" href="shape-outside-floats-margin-003-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -22,7 +23,7 @@
     float: left;
     width: 100px;
     height: 20px;
-    -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
+    -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
     margin-top: 20px;
     margin-bottom: 20px;
     background-color: green;
@@ -32,7 +33,7 @@
     float: right;
     width: 100px;
     height: 20px;
-    -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
+    -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
     margin-top: 20px;
     margin-bottom: 20px;
     background-color: green;
index a42bf08..6c1db2f 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
index aadc9b3..210291e 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a positive bottom margin</title>
+<title>CSS Test: shape-outside on floats with a positive top margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests that a positive margin on the logical top side of a float does not affect inline content wrapping around the shape.">
 <link rel="match" href="shape-outside-floats-margin-004-ref.html">
 <meta name="flags" content="ahem">
 <head>
index c37fc73..793033b 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 7771c61..40ad17b 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a positive margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the opposite logical side as the float direction (eg: right margin on left float) is properly ignored in the case of a zero extent shape.">
 <link rel="match" href="shape-outside-floats-margin-000-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -35,7 +36,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 17c4ca2..bc583b0 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a positive margin</title>
+<title>CSS Test: shape-outside on floats with a positive margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the opposite logical side as the float direction (eg: margin on logical right of a left float) is properly ignored in the case of a zero extent shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 26aa29e..cba17c0 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a positive margin</title>
+<title>CSS Test: shape-outside on floats with a positive margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the same logical side as the float direction (eg: margin on logical left of a left float) is properly ignored in the case of a zero extent shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 7a39dd5..667bf42 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a positive margin</title>
+<title>CSS Test: shape-outside on floats with a positive margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the opposite logical side as the float direction (eg: margin on logical right of a left float) is properly ignored in the case of a zero extent shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 451d15f..e5b1c46 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a positive margin</title>
+<title>CSS Test: shape-outside on floats with a positive margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a positive margin on the same logical side as the float direction (eg: margin on logical left of a left float) is properly ignored in the case of a zero extent shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index c37fc73..793033b 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index a21b2ce..a88da3d 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a negative margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the same logical side as the float direction (eg: margin on logical left of a left float) properly crops the shape.">
 <link rel="match" href="shape-outside-floats-margin-000-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -35,7 +36,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index c37fc73..793033b 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index aa31431..bb9a3e7 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a negative margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the opposite logical side as the float direction (eg: margin on logical right of a left float) properly crops the shape.">
 <link rel="match" href="shape-outside-floats-margin-000-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -35,7 +36,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two horizontal green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 03cfaed..396c7cc 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 0e565a2..7572aa8 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a negative top margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the logical top of the float properly crops the shape.">
 <link rel="match" href="shape-outside-floats-margin-012-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -35,7 +36,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 03cfaed..396c7cc 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index acead0c..3df7a7e 100644 (file)
@@ -2,7 +2,8 @@
 <title>CSS Test: shape-outside on floats with a negative bottom margin</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the logical bottom of the float properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-012-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -35,7 +36,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index a4f05ea..01965bf 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the same logical side as the float direction (eg: margin on logical left of a left float) properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index dfdd4ee..d7f6ba0 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the opposite logical side as the float direction (eg: margin on logical left of a left float) properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index ab8241f..b527b98 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the same logical side as the float direction (eg: margin on logical left of a left float) properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container" style="text-align: right">
         <div id="float-right">
         </div>
index 7c06309..0336264 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 7ca1dd3..2ef50a2 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the opposite logical side as the float direction (eg: margin on logical right of a left float) properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-006-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on opposite sides.</p>
+    <p>This should display two vertical green bars, with white squares on opposite sides.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 72099c1..a7ce4bb 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index a3d6046..78e76e8 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative top margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the logical top side of the float properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-018-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 72099c1..a7ce4bb 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 2922224..cd68172 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative top margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the logical bottom side of the float properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-018-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index ef122c0..d618f06 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index ac26b7d..5b47d71 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative top margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the logical bottom side of the float properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-020-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index ef122c0..d618f06 100644 (file)
@@ -2,7 +2,7 @@
 <title>CSS Reference</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
 <meta name="flags" content="ahem">
 <head>
 <style>
@@ -31,7 +31,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 5166d22..9fb8b68 100644 (file)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<title>CSS Test: shape-outside on floats with a negative top margin</title>
+<title>CSS Test: shape-outside on floats with a negative margin, vertical writing mode</title>
 <link rel="author" title="Adobe" href="http://html.adobe.com/">
 <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-margin-property">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior">
+<meta name="assert" content="This tests if a negative margin on the logical top side of the float properly clips the shape.">
 <link rel="match" href="shape-outside-floats-margin-020-ref.html">
 <meta name="flags" content="ahem">
 <head>
@@ -36,7 +37,7 @@
 </style>
 
 <body>
-    <p>This should display two green bars, with white squares on one end.</p>
+    <p>This should display two vertical green bars, with white squares on one end.</p>
     <div class="container">
         <div id="float-left">
         </div>
index 8c8513d..36d61b2 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-10-21 12:29
+Last Import: 2013-10-31 13:25
 W3C Mercurial changeset: Not Available
 Test status at time of import: unknown
 ------------------------------------------------------------------------
@@ -24,8 +24,6 @@ List of files:
 /LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html
 /LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-000-expected.html
 /LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-000.html
-/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref-expected.html
-/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref.html
 /LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html
 /LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html
 /LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-002-expected.html