Reviewed by Geoff.

        Changing these two counters tests so they pass on the BuildBot.

        * fast/css/counters/counter04-expected.checksum:
        * fast/css/counters/counter04-expected.png:
        * fast/css/counters/counter04-expected.txt:
        * fast/css/counters/counter04.html:
        * fast/css/counters/counters04-expected.checksum:
        * fast/css/counters/counters04-expected.png:
        * fast/css/counters/counters04-expected.txt:
        * fast/css/counters/counters04.html:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f6423b30ca1be1ad88562a2c2ebfc7f0d399e421..ff4d90d4d6454788b2641f9297076b4f16504535 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2006-10-03  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Geoff.
+
+        Changing these two counters tests so they pass on the BuildBot.
+
+        * fast/css/counters/counter04-expected.checksum:
+        * fast/css/counters/counter04-expected.png:
+        * fast/css/counters/counter04-expected.txt:
+        * fast/css/counters/counter04.html:
+        * fast/css/counters/counters04-expected.checksum:
+        * fast/css/counters/counters04-expected.png:
+        * fast/css/counters/counters04-expected.txt:
+        * fast/css/counters/counters04.html:
+
 2006-10-03  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by geoff

diff --git a/LayoutTests/fast/css/counters/counter04-expected.checksum b/LayoutTests/fast/css/counters/counter04-expected.checksum
index d435301ed4ca5f09aa519779c9c6db488099ac8c..0a6d6d372727fe51ebcd36b4081fcf99eae74441 100644 (file)
--- a/LayoutTests/fast/css/counters/counter04-expected.checksum
+++ b/LayoutTests/fast/css/counters/counter04-expected.checksum
@@ -1 +1 @@
-0e84486ad223463411c5245401dc7599
\ No newline at end of file
+275a92c3217999bf44986c0e69c1fbf9
\ No newline at end of file

diff --git a/LayoutTests/fast/css/counters/counter04-expected.png b/LayoutTests/fast/css/counters/counter04-expected.png
index 29a5ad9009d868d93fc2485f8a352c92d8d7580d..188d16ca559f2f0816fa6042dbe3ea30874d8418 100644 (file)
Binary files a/LayoutTests/fast/css/counters/counter04-expected.png and b/LayoutTests/fast/css/counters/counter04-expected.png differ

diff --git a/LayoutTests/fast/css/counters/counter04-expected.txt b/LayoutTests/fast/css/counters/counter04-expected.txt
index 3c2f3c6d6325eaebb800fd6bd0d167759e54cb82..02ff0b66d42ac54089a901b91c9fe7ca055f2c37 100644 (file)
--- a/LayoutTests/fast/css/counters/counter04-expected.txt
+++ b/LayoutTests/fast/css/counters/counter04-expected.txt
@@ -1,16 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
-  RenderBlock {HTML} at (0,0) size 800x94
-    RenderBody {BODY} at (8,16) size 784x70
+layer at (0,0) size 800x76
+  RenderBlock {HTML} at (0,0) size 800x76
+    RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 233x18
-          text run at (0,0) width 233: "The following two lines should look "
-        RenderInline {EM} at (0,0) size 91x18
-          RenderText {#text} at (233,0) size 91x18
-            text run at (233,0) width 91: "approximately"
-        RenderText {#text} at (324,0) size 63x18
-          text run at (324,0) width 63: " the same:"
+        RenderText {#text} at (0,0) size 309x18
+          text run at (0,0) width 309: "Below, you should see twelve boxes on one line."
       RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 9x18
           RenderInline (generated) at (0,0) size 9x18
@@ -83,17 +78,3 @@ layer at (0,0) size 800x94
             RenderCounter at (143,0) size 9x18
               text run at (143,0) width 9: "\x{25A0}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,52) size 784x18
-        RenderText {#text} at (0,0) size 188x18
-          text run at (0,0) width 16: "\x{25FE} "
-          text run at (16,0) width 16: "\x{25FE} "
-          text run at (32,0) width 16: "\x{25FE} "
-          text run at (48,0) width 16: "\x{25FE} "
-          text run at (64,0) width 16: "\x{25FE} "
-          text run at (80,0) width 16: "\x{25FE} "
-          text run at (96,0) width 16: "\x{25FE} "
-          text run at (112,0) width 16: "\x{25FE} "
-          text run at (128,0) width 16: "\x{25FE} "
-          text run at (144,0) width 16: "\x{25FE} "
-          text run at (160,0) width 16: "\x{25FE} "
-          text run at (176,0) width 12: "\x{25FE}"

diff --git a/LayoutTests/fast/css/counters/counter04.html b/LayoutTests/fast/css/counters/counter04.html
index 72a320f7777b0d530f00b1d3fdc39a4b11a1de17..2388ea25880564014b6a1dc79fc09d81ad383a4f 100644 (file)
--- a/LayoutTests/fast/css/counters/counter04.html
+++ b/LayoutTests/fast/css/counters/counter04.html
@@ -15,7 +15,7 @@
  </head>
  <body>
 
- <p>The following two lines should look <em>approximately</em> the same:</p>
+ <p>Below, you should see twelve boxes on one line.</p>
 
  <div id="test">
    <span></span>
@@ -32,20 +32,5 @@
    <span></span>
  </div>
 
- <div>
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
-   &#x25FE;
- </div>
-
  </body>
 </html>
\ No newline at end of file

diff --git a/LayoutTests/fast/css/counters/counters04-expected.checksum b/LayoutTests/fast/css/counters/counters04-expected.checksum
index edd0b8336d19d6b5829f0bda2fafb50b34d2d27c..cb07071ae987298b85d96b992c15fc18e991d918 100644 (file)
--- a/LayoutTests/fast/css/counters/counters04-expected.checksum
+++ b/LayoutTests/fast/css/counters/counters04-expected.checksum
@@ -1 +1 @@
-c304ccef78be00eb8a6460955a7974b8
\ No newline at end of file
+6ded241e0ec0b20bf8823701db3f5f21
\ No newline at end of file

diff --git a/LayoutTests/fast/css/counters/counters04-expected.png b/LayoutTests/fast/css/counters/counters04-expected.png
index 7e32009523b8b4f52dd233fa88f015a0ee234ac8..1e414c767866d29cf843177f2d01571c7191b4d1 100644 (file)
Binary files a/LayoutTests/fast/css/counters/counters04-expected.png and b/LayoutTests/fast/css/counters/counters04-expected.png differ

diff --git a/LayoutTests/fast/css/counters/counters04-expected.txt b/LayoutTests/fast/css/counters/counters04-expected.txt
index 0795372cfbf6da3b4a65819a65134b0a91ac45e0..a130cd27c1a1ee2c9781b208e4d45648b2b3add2 100644 (file)
--- a/LayoutTests/fast/css/counters/counters04-expected.txt
+++ b/LayoutTests/fast/css/counters/counters04-expected.txt
@@ -1,16 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
-  RenderBlock {HTML} at (0,0) size 800x94
-    RenderBody {BODY} at (8,16) size 784x70
+layer at (0,0) size 800x76
+  RenderBlock {HTML} at (0,0) size 800x76
+    RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 233x18
-          text run at (0,0) width 233: "The following two lines should look "
-        RenderInline {EM} at (0,0) size 91x18
-          RenderText {#text} at (233,0) size 91x18
-            text run at (233,0) width 91: "approximately"
-        RenderText {#text} at (324,0) size 63x18
-          text run at (324,0) width 63: " the same:"
+        RenderText {#text} at (0,0) size 481x18
+          text run at (0,0) width 481: "Below, you should see twelve pairs of boxes, each pair separated with a dot."
       RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 22x18
           RenderInline (generated) at (0,0) size 22x18
@@ -83,17 +78,3 @@ layer at (0,0) size 800x94
             RenderCounter at (286,0) size 22x18
               text run at (286,0) width 22: "\x{25A0}.\x{25A0}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,52) size 784x18
-        RenderText {#text} at (0,0) size 380x18
-          text run at (0,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (32,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (64,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (96,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (128,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (160,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (192,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (224,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (256,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (288,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (320,0) width 32: "\x{25FE}.\x{25FE} "
-          text run at (352,0) width 28: "\x{25FE}.\x{25FE}"

diff --git a/LayoutTests/fast/css/counters/counters04.html b/LayoutTests/fast/css/counters/counters04.html
index c7d2a06b3307c34714308d0ac7262ecb44392996..be51fb58b9e342724056a4c1ee6cd9e294020009 100644 (file)
--- a/LayoutTests/fast/css/counters/counters04.html
+++ b/LayoutTests/fast/css/counters/counters04.html
@@ -15,7 +15,7 @@
  </head>
  <body>
 
- <p>The following two lines should look <em>approximately</em> the same:</p>
+ <p>Below, you should see twelve pairs of boxes, each pair separated with a dot.</p>
 
  <div id="test">
    <span></span>
@@ -32,20 +32,5 @@
    <span></span>
  </div>
 
- <div>
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
-   &#x25FE;.&#x25FE;
- </div>
-
  </body>
 </html>
\ No newline at end of file