WebKit removed support for 'compact' and changed their baseline to match (r40259).

We needed to update ours as well.

Review URL: http://codereview.chromium.org/19446

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8840 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 25 insertions, 25 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.checksum
index 878bd0d..6a20f1d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.checksum
@@ -1 +1 @@
-d16fd4092e4961c96e759d13bbb2a81c
\ No newline at end of file
+dd64ac5aa8eb9b17c50303d76c5d0b7f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.png
index 35d5a59..241d221 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.txt
index 560c7a7..c8ef2da 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/001-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x80
-  RenderBlock {HTML} at (0,0) size 800x80
-    RenderBody {BODY} at (8,16) size 784x56
+layer at (0,0) size 800x86
+  RenderBlock {HTML} at (0,0) size 800x86
+    RenderBody {BODY} at (8,16) size 784x62
       RenderBlock {P} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 185x19
           text run at (0,0) width 185: "There should be no red below."
-      RenderBlock {DIV} at (160,36) size 624x20 [color=#FF0000] [bgcolor=#00FF00]
-        RenderBlock (compact) {DIV} at (-160,0) size 0x0 [color=#000000]
-          RenderText {#text} at (0,0) size 29x19
-            text run at (0,0) width 29: "Test:"
+      RenderBlock {DIV} at (0,36) size 784x20
+        RenderText {#text} at (0,0) size 29x19
+          text run at (0,0) width 29: "Test:"
+      RenderBlock {DIV} at (160,56) size 624x6 [color=#FF0000] [bgcolor=#00FF00]
         RenderInline {SPAN} at (0,0) size 284x19 [color=#000000]
-          RenderText {#text} at (0,0) size 284x19
-            text run at (0,0) width 284: "This sentence should have a green background."
+          RenderText {#text} at (0,-9) size 284x19
+            text run at (0,-9) width 284: "This sentence should have a green background."
         RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.checksum
index 1063f49..103ac7a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.checksum
@@ -1 +1 @@
-ce20f2abcf62cba25277ea65a62a703e
\ No newline at end of file
+c6661c2bd6d571ed42a00797165be21a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.png
index de37fe9..0cd75b6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.txt
index 2e530aa..38b4fd5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/002-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x120
-  RenderBlock {HTML} at (0,0) size 800x120
-    RenderBody {BODY} at (8,8) size 784x104
+layer at (0,0) size 800x152
+  RenderBlock {HTML} at (0,0) size 800x152
+    RenderBody {BODY} at (8,8) size 784x136
       RenderBlock (anonymous) at (0,0) size 784x20
         RenderInline {DIV} at (0,0) size 528x16 [color=#FFFFFF] [bgcolor=#FF0000]
           RenderText {#text} at (0,2) size 528x16
@@ -11,10 +11,10 @@ layer at (0,0) size 800x120
       RenderBlock {P} at (0,36) size 784x20
         RenderText {#text} at (0,0) size 329x19
           text run at (0,0) width 329: "There should be a single green rectangle square below."
-      RenderBlock {DIV} at (0,72) size 64x32 [color=#008000] [bgcolor=#FF0000]
-        RenderBlock {DIV} at (32,0) size 32x32
-          RenderBlock (compact) {DIV} at (-32,0) size 0x0
-            RenderText {#text} at (0,0) size 32x32
-              text run at (0,0) width 32: "X"
+      RenderBlock {DIV} at (0,72) size 64x64 [color=#008000] [bgcolor=#FF0000]
+        RenderBlock {DIV} at (0,0) size 64x32
+          RenderText {#text} at (0,0) size 32x32
+            text run at (0,0) width 32: "X"
+        RenderBlock {DIV} at (32,32) size 32x32
           RenderText {#text} at (0,0) size 32x32
             text run at (0,0) width 32: "X"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/003-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/003-expected.txt
index cf18ba4..5fbf6a1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/003-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/compact/003-expected.txt
@@ -4,10 +4,10 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x576
       RenderBlock {DL} at (0,0) size 784x40
-        RenderBlock (compact) {DT} at (0,0) size 784x20
+        RenderBlock {DT} at (0,0) size 784x20
           RenderText {#text} at (0,0) size 56x19
             text run at (0,0) width 56: "Line One"
-        RenderBlock (compact) {DT} at (0,20) size 784x20
+        RenderBlock {DT} at (0,20) size 784x20
           RenderText {#text} at (0,0) size 30x19
             text run at (0,0) width 30: "Line "
           RenderInline {SPAN} at (0,0) size 28x19
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 1647d81..7df2337 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -332,6 +332,10 @@ DEFER : LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.htm
 
 // These were recently rebaselined on Windows and probably just need a
 // rebaseline on other platforms as well.
+// Compact support was removed from WebKit by Hyatt and layout tests rebaselined in r40259.
+LINUX : LayoutTests/fast/compact/001.html = FAIL
+LINUX : LayoutTests/fast/compact/002.html = FAIL
+LINUX : LayoutTests/fast/compact/003.html = FAIL
 DEFER LINUX : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
 LINUX MAC : LayoutTests/fast/dynamic/insert-before-table-part-in-continuation.html = FAIL
 MAC : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
@@ -1774,10 +1778,6 @@ WIN LINUX : LayoutTests/fast/table/vertical-align-baseline.html = FAIL
 
 // Merge 40165:40297 -- regressions
 LINUX WIN : LayoutTests/editing/style/smoosh-styles-003.html = FAIL
-// I think Hyatt removed support for compact.
-LINUX WIN : LayoutTests/fast/compact/001.html = FAIL
-LINUX WIN : LayoutTests/fast/compact/002.html = FAIL
-LINUX WIN : LayoutTests/fast/compact/003.html = FAIL
 LINUX WIN : LayoutTests/fast/forms/form-hides-table.html = FAIL
 LayoutTests/fast/forms/textarea-no-scroll-on-blur.html = FAIL
 LINUX WIN : LayoutTests/fast/loader/null-request-after-willSendRequest.html = FAIL