Update baselines for fast\forms\box-shadow-override.html

TBR=dpranke
TEST=none
BUG=21118

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

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

7 files changed, 151 insertions, 77 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.checksum
index 409e739..fb5d0f5c 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.checksum
@@ -1 +1 @@
-2c50717e68a421f155d21aa146df1ce5
\ No newline at end of file
+2b90e756de8c42229b8ebc1f4d303dfd
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.png
index 0bfb398..f893c33 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.txt
new file mode 100644
index 0000000..36eb329
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/box-shadow-override-expected.txt
@@ -0,0 +1,80 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 379x19
+          text run at (0,0) width 379: "Tests that box shadow is not applied to Aqua-themed controls."
+      RenderBlock {P} at (0,36) size 784x20
+        RenderText {#text} at (0,0) size 245x19
+          text run at (0,0) width 245: "You should not see any red on this page."
+      RenderBlock {DIV} at (0,72) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (0,2) size 1x11
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,98) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,124) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (2,0) size 18x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,150) size 784x34
+        RenderBlock {INPUT} at (5,11) size 13x13
+        RenderText {#text} at (21,9) size 4x19
+          text run at (21,9) width 4: " "
+        RenderBlock {INPUT} at (29,11) size 13x13
+        RenderText {#text} at (45,9) size 4x19
+          text run at (45,9) width 4: " "
+        RenderSlider {INPUT} at (51,3) size 129x21 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (59,0) size 11x21
+        RenderText {#text} at (182,9) size 4x19
+          text run at (182,9) width 4: " "
+        RenderFileUploadControl {INPUT} at (188,8) size 238x22 "No file chosen"
+          RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+            RenderBlock (anonymous) at (8,2) size 75x18
+              RenderText at (3,1) size 69x16
+                text run at (3,1) width 69: "Choose File"
+        RenderText {#text} at (428,9) size 4x19
+          text run at (428,9) width 4: " "
+        RenderButton {INPUT} at (434,2) size 78x30 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+          RenderBlock (anonymous) at (8,2) size 62x26
+            RenderText at (3,1) size 56x23
+              text run at (3,1) width 56: "Button"
+        RenderText {#text} at (514,9) size 4x19
+          text run at (514,9) width 4: " "
+        RenderButton {INPUT} at (520,8) size 60x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+          RenderBlock (anonymous) at (8,2) size 44x18
+            RenderText at (3,1) size 38x16
+              text run at (3,1) width 38: "Button"
+        RenderText {#text} at (582,9) size 4x19
+          text run at (582,9) width 4: " "
+        RenderButton {INPUT} at (586,16) size 36x12 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+          RenderBlock (anonymous) at (8,2) size 20x8
+            RenderText at (3,1) size 14x6
+              text run at (3,1) width 14: "Button"
+        RenderText {#text} at (622,9) size 4x19
+          text run at (622,9) width 4: " "
+        RenderButton {BUTTON} at (628,2) size 78x30 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+          RenderBlock (anonymous) at (8,2) size 62x26
+            RenderText {#text} at (3,1) size 56x23
+              text run at (3,1) width 56: "Button"
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (14,85) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16
+    RenderText {#text} at (1,0) size 41x16
+      text run at (1,0) width 41: "Search"
+layer at (31,111) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+layer at (36,137) size 116x16
+  RenderBlock {DIV} at (23,0) size 116x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum
index 9b818041..98dbcb0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.checksum
@@ -1 +1 @@
-5a210930aa13f849906e130c4007e9e7
\ No newline at end of file
+0216a4b4a334a8a531c2ff4c06e3f374
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png
index c6c530b..4ae8f67 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.txt
index a5801d5..e48b4fc 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.txt
@@ -3,79 +3,78 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 393x18
-          text run at (0,0) width 393: "Tests that box shadow is not applied to Aqua-themed controls."
-      RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 257x18
-          text run at (0,0) width 257: "You should not see any red on this page."
-      RenderBlock {DIV} at (0,68) size 784x19
-        RenderTextControl {INPUT} at (0,0) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderBlock {DIV} at (2,3) size 142x13
-            RenderBlock {DIV} at (0,0) size 8x11
-            RenderBlock {DIV} at (129,0) size 13x11
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 379x19
+          text run at (0,0) width 379: "Tests that box shadow is not applied to Aqua-themed controls."
+      RenderBlock {P} at (0,36) size 784x20
+        RenderText {#text} at (0,0) size 245x19
+          text run at (0,0) width 245: "You should not see any red on this page."
+      RenderBlock {DIV} at (0,72) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (0,2) size 1x11
+            RenderBlock {DIV} at (139,4) size 9x9
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,87) size 784x19
-        RenderTextControl {INPUT} at (0,0) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderBlock {DIV} at (2,3) size 142x13
-            RenderBlock {DIV} at (0,0) size 17x11
-            RenderBlock {DIV} at (129,0) size 13x11
+      RenderBlock {DIV} at (0,98) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,106) size 784x19
-        RenderTextControl {INPUT} at (0,0) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderBlock {DIV} at (2,3) size 142x13
-            RenderBlock {DIV} at (0,0) size 22x11
-            RenderBlock {DIV} at (129,0) size 13x11
+      RenderBlock {DIV} at (0,124) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (2,0) size 18x13
+            RenderBlock {DIV} at (139,4) size 9x9
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock (anonymous) at (0,125) size 784x32
-        RenderBlock {INPUT} at (5,10) size 12x13
-        RenderText {#text} at (20,9) size 4x18
-          text run at (20,9) width 4: " "
-        RenderBlock {INPUT} at (28,11) size 12x12
-        RenderText {#text} at (43,9) size 4x18
-          text run at (43,9) width 4: " "
-        RenderSlider {INPUT} at (49,8) size 129x15 [bgcolor=#FFFFFF]
-        RenderText {#text} at (180,9) size 4x18
-          text run at (180,9) width 4: " "
-        RenderFileUploadControl {INPUT} at (186,10) size 237x18
-          RenderButton {INPUT} at (0,0) size 78x18 [bgcolor=#C0C0C0]
-            RenderBlock (anonymous) at (8,2) size 62x13
-              RenderText at (0,0) size 62x13
-                text run at (0,0) width 62: "Choose File"
-        RenderText {#text} at (425,9) size 4x18
-          text run at (425,9) width 4: " "
-        RenderButton {INPUT} at (431,8) size 58x21 [bgcolor=#C0C0C0]
-          RenderBlock (anonymous) at (8,2) size 42x16
-            RenderText at (0,0) size 42x16
-              text run at (0,0) width 42: "Button"
-        RenderText {#text} at (491,9) size 4x18
-          text run at (491,9) width 4: " "
-        RenderButton {INPUT} at (497,10) size 51x18 [bgcolor=#C0C0C0]
-          RenderBlock (anonymous) at (8,2) size 35x13
-            RenderText at (0,0) size 35x13
-              text run at (0,0) width 35: "Button"
-        RenderText {#text} at (550,9) size 4x18
-          text run at (550,9) width 4: " "
-        RenderButton {INPUT} at (554,12) size 45x15 [bgcolor=#C0C0C0]
-          RenderBlock (anonymous) at (8,2) size 29x11
-            RenderText at (0,0) size 29x11
-              text run at (0,0) width 29: "Button"
-        RenderText {#text} at (599,9) size 4x18
-          text run at (599,9) width 4: " "
-        RenderButton {BUTTON} at (605,2) size 80x28 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
-          RenderBlock (anonymous) at (8,2) size 64x23
-            RenderText {#text} at (0,0) size 64x23
-              text run at (0,0) width 64: "Button"
+      RenderBlock (anonymous) at (0,150) size 784x34
+        RenderBlock {INPUT} at (5,11) size 13x13
+        RenderText {#text} at (21,9) size 4x19
+          text run at (21,9) width 4: " "
+        RenderBlock {INPUT} at (29,11) size 13x13
+        RenderText {#text} at (45,9) size 4x19
+          text run at (45,9) width 4: " "
+        RenderSlider {INPUT} at (51,3) size 129x21 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (59,0) size 11x21
+        RenderText {#text} at (182,9) size 4x19
+          text run at (182,9) width 4: " "
+        RenderFileUploadControl {INPUT} at (188,8) size 238x22 "No file chosen"
+          RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+            RenderBlock (anonymous) at (8,2) size 75x18
+              RenderText at (3,1) size 69x16
+                text run at (3,1) width 69: "Choose File"
+        RenderText {#text} at (428,9) size 4x19
+          text run at (428,9) width 4: " "
+        RenderButton {INPUT} at (434,2) size 78x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 62x26
+            RenderText at (3,1) size 56x23
+              text run at (3,1) width 56: "Button"
+        RenderText {#text} at (514,9) size 4x19
+          text run at (514,9) width 4: " "
+        RenderButton {INPUT} at (520,8) size 60x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 44x18
+            RenderText at (3,1) size 38x16
+              text run at (3,1) width 38: "Button"
+        RenderText {#text} at (582,9) size 4x19
+          text run at (582,9) width 4: " "
+        RenderButton {INPUT} at (586,16) size 36x12 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 20x8
+            RenderText at (3,1) size 14x6
+              text run at (3,1) width 14: "Button"
+        RenderText {#text} at (622,9) size 4x19
+          text run at (622,9) width 4: " "
+        RenderButton {BUTTON} at (628,2) size 78x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 62x26
+            RenderText {#text} at (3,1) size 56x23
+              text run at (3,1) width 56: "Button"
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-layer at (18,79) size 121x13
-  RenderBlock {DIV} at (8,0) size 121x13
-    RenderText {#text} at (1,0) size 36x13
-      text run at (1,0) width 36: "Search"
-layer at (27,98) size 112x13
-  RenderBlock {DIV} at (17,0) size 112x13
-layer at (32,117) size 107x13
-  RenderBlock {DIV} at (22,0) size 107x13
-layer at (114,141) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
+layer at (14,85) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16
+    RenderText {#text} at (1,0) size 41x16
+      text run at (1,0) width 41: "Search"
+layer at (31,111) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+layer at (36,137) size 116x16
+  RenderBlock {DIV} at (23,0) size 116x16
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index fd3c81b..997fbd6 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -674,11 +674,6 @@ BUG24208 WIN DEBUG : LayoutTests/http/tests/navigation/post-goback1.html = FAIL
 BUG24208 SLOW WIN RELEASE : LayoutTests/http/tests/navigation/post-goback1.html = FAIL
 BUG24208 LINUX MAC : LayoutTests/http/tests/navigation/post-goback1.html = FAIL
 
-// Since we don't have Aqua-themed controls, don't ignore the
-// box-shadow properties of controls that request Aqua theming.  But since Aqua
-// controls are rare on the web, defer this fix.
-BUG21118 WIN LINUX : LayoutTests/fast/forms/box-shadow-override.html = FAIL
-
 // These tests all depend on SessionStorage events which are not yet supported.
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/iframe-events.html = TIMEOUT
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/simple-events.html = FAIL