Rebaseline a bunch of slider/input/zooming tests. They are all alright.

R=gwilson
BUG=10463,10467
TEST=no layout test regressions.

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

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

20 files changed, 148 insertions, 109 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.checksum
new file mode 100644
index 0000000..fd98cfe
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.checksum
@@ -0,0 +1 @@
+7690b210803ea662242ba9755815033a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.png
new file mode 100644
index 0000000..32a5217
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.txt
new file mode 100644
index 0000000..d190cf9c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/clip-zooming-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x128

+  RenderBlock {HTML} at (0,0) size 800x128

+    RenderBody {BODY} at (0,24) size 800x80

+      RenderBlock {P} at (0,0) size 800x28

+        RenderInline {A} at (0,0) size 459x27 [color=#0000EE]

+          RenderText {#text} at (0,0) size 459x27

+            text run at (0,0) width 459: "https://bugs.webkit.org/show_bug.cgi?id=24753"

+      RenderBlock {P} at (0,52) size 800x28

+        RenderText {#text} at (0,0) size 601x27

+          text run at (0,0) width 601: "Test CSS clip with zooming. You should not see any red below"

+layer at (75,150) size 150x150

+  RenderBlock (positioned) {DIV} at (75,150) size 150x150 [bgcolor=#FF0000]

+layer at (0,75) size 300x300 backgroundClip at (75,150) size 150x150 clip at (75,150) size 150x150 outlineClip at (75,150) size 150x150

+  RenderBlock (positioned) {DIV} at (0,75) size 300x300 [bgcolor=#008000]

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum
index 0a4a16f..50aed8c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.checksum
@@ -1 +1 @@
-bd64358778cd7ae6d26f14e6cfa44ad5
\ No newline at end of file
+77511a384136efc286fcaeac9bf53bc7
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png
index 1763fb1..6bba68f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
index 986f5d6..22aba9a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
@@ -6,99 +6,98 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,0) size 784x20
         RenderText {#text} at (0,0) size 717x19
           text run at (0,0) width 717: "This tests the height attribute of form elements. The only element that should honour this value is the Image type of input."
-      RenderBlock {FORM} at (0,20) size 784x269
-        RenderText {#text} at (0,1) size 33x19
-          text run at (0,1) width 33: "input "
-        RenderTextControl {INPUT} at (33,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (188,1) size 4x19
-          text run at (188,1) width 4: " "
-        RenderBR {BR} at (192,16) size 0x0
-        RenderText {#text} at (0,23) size 26x19
-          text run at (0,23) width 26: "text "
-        RenderTextControl {INPUT} at (26,22) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (181,23) size 4x19
-          text run at (181,23) width 4: " "
-        RenderBR {BR} at (185,38) size 0x0
-        RenderText {#text} at (0,45) size 63x19
-          text run at (0,45) width 63: "checkbox "
-        RenderBlock {INPUT} at (67,47) size 13x13
-        RenderText {#text} at (83,45) size 4x19
-          text run at (83,45) width 4: " "
-        RenderBR {BR} at (87,60) size 0x0
-        RenderText {#text} at (0,68) size 21x19
-          text run at (0,68) width 21: "file "
-        RenderFileUploadControl {INPUT} at (23,67) size 238x22
+      RenderBlock {FORM} at (0,20) size 784x298
+        RenderText {#text} at (0,3) size 33x19
+          text run at (0,3) width 33: "input "
+        RenderTextControl {INPUT} at (35,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (192,3) size 4x19
+          text run at (192,3) width 4: " "
+        RenderBR {BR} at (196,18) size 0x0
+        RenderText {#text} at (0,29) size 26x19
+          text run at (0,29) width 26: "text "
+        RenderTextControl {INPUT} at (28,28) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (185,29) size 4x19
+          text run at (185,29) width 4: " "
+        RenderBR {BR} at (189,44) size 0x0
+        RenderText {#text} at (0,53) size 63x19
+          text run at (0,53) width 63: "checkbox "
+        RenderBlock {INPUT} at (67,55) size 13x13
+        RenderText {#text} at (83,53) size 4x19
+          text run at (83,53) width 4: " "
+        RenderBR {BR} at (87,68) size 0x0
+        RenderText {#text} at (0,76) size 21x19
+          text run at (0,76) width 21: "file "
+        RenderFileUploadControl {INPUT} at (23,75) size 238x22
           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 (263,68) size 4x19
-          text run at (263,68) width 4: " "
-        RenderBR {BR} at (267,83) size 0x0
-        RenderText {#text} at (0,91) size 39x19
-          text run at (0,91) width 39: "image "
-        RenderImage {INPUT} at (39,105) size 10x1
-        RenderText {#text} at (49,91) size 4x19
-          text run at (49,91) width 4: " "
-        RenderBR {BR} at (53,106) size 0x0
-        RenderText {#text} at (0,112) size 35x19
-          text run at (0,112) width 35: "radio "
-        RenderBlock {INPUT} at (40,114) size 13x13
-        RenderText {#text} at (56,112) size 4x19
-          text run at (56,112) width 4: " "
-        RenderBR {BR} at (60,127) size 0x0
-        RenderText {#text} at (0,135) size 37x19
-          text run at (0,135) width 37: "range "
-        RenderSlider {INPUT} at (39,134) size 129x16 [bgcolor=#FFFFFF]
-        RenderText {#text} at (170,135) size 4x19
-          text run at (170,135) width 4: " "
-        RenderBR {BR} at (174,150) size 0x0
-        RenderText {#text} at (0,156) size 33x19
-          text run at (0,156) width 33: "reset "
-        RenderButton {INPUT} at (33,155) size 56x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+        RenderText {#text} at (263,76) size 4x19
+          text run at (263,76) width 4: " "
+        RenderBR {BR} at (267,91) size 0x0
+        RenderText {#text} at (0,99) size 39x19
+          text run at (0,99) width 39: "image "
+        RenderImage {INPUT} at (39,113) size 10x1
+        RenderText {#text} at (49,99) size 4x19
+          text run at (49,99) width 4: " "
+        RenderBR {BR} at (53,114) size 0x0
+        RenderText {#text} at (0,120) size 35x19
+          text run at (0,120) width 35: "radio "
+        RenderBlock {INPUT} at (40,122) size 13x13
+        RenderText {#text} at (56,120) size 4x19
+          text run at (56,120) width 4: " "
+        RenderBR {BR} at (60,135) size 0x0
+        RenderText {#text} at (0,148) size 37x19
+          text run at (0,148) width 37: "range "
+        RenderSlider {INPUT} at (39,142) size 129x21 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (59,0) size 11x21
+        RenderText {#text} at (170,148) size 4x19
+          text run at (170,148) width 4: " "
+        RenderBR {BR} at (174,163) size 0x0
+        RenderText {#text} at (0,171) size 33x19
+          text run at (0,171) width 33: "reset "
+        RenderButton {INPUT} at (35,170) size 56x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
           RenderBlock (anonymous) at (8,2) size 40x18
             RenderText at (3,1) size 34x16
               text run at (3,1) width 34: "Reset"
-        RenderText {#text} at (89,156) size 4x19
-          text run at (89,156) width 4: " "
-        RenderBR {BR} at (93,171) size 0x0
-        RenderText {#text} at (0,178) size 43x19
-          text run at (0,178) width 43: "submit "
-        RenderButton {INPUT} at (43,177) size 63x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+        RenderText {#text} at (93,171) size 4x19
+          text run at (93,171) width 4: " "
+        RenderBR {BR} at (97,186) size 0x0
+        RenderText {#text} at (0,197) size 43x19
+          text run at (0,197) width 43: "submit "
+        RenderButton {INPUT} at (45,196) size 63x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
           RenderBlock (anonymous) at (8,2) size 47x18
             RenderText at (3,1) size 41x16
               text run at (3,1) width 41: "Submit"
-        RenderText {#text} at (106,178) size 4x19
-          text run at (106,178) width 4: " "
-        RenderBR {BR} at (110,193) size 0x0
-        RenderText {#text} at (0,202) size 45x19
-          text run at (0,202) width 45: "isindex "
-        RenderTextControl {INPUT} at (47,201) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (206,202) size 4x19
-          text run at (206,202) width 4: " "
-        RenderBR {BR} at (210,217) size 0x0
-        RenderText {#text} at (0,226) size 63x19
-          text run at (0,226) width 63: "password "
-        RenderTextControl {INPUT} at (63,225) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (218,226) size 4x19
-          text run at (218,226) width 4: " "
-        RenderBR {BR} at (222,241) size 0x0
-        RenderText {#text} at (0,248) size 43x19
-          text run at (0,248) width 43: "search "
-        RenderTextControl {INPUT} at (43,247) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderBlock {DIV} at (2,3) size 151x16
-            RenderBlock {DIV} at (0,13) size 0x0
-            RenderBlock {DIV} at (151,13) size 0x0
+        RenderText {#text} at (110,197) size 4x19
+          text run at (110,197) width 4: " "
+        RenderBR {BR} at (114,212) size 0x0
+        RenderText {#text} at (0,223) size 45x19
+          text run at (0,223) width 45: "isindex "
+        RenderTextControl {INPUT} at (47,222) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (206,223) size 4x19
+          text run at (206,223) width 4: " "
+        RenderBR {BR} at (210,238) size 0x0
+        RenderText {#text} at (0,249) size 63x19
+          text run at (0,249) width 63: "password "
+        RenderTextControl {INPUT} at (65,248) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (222,249) size 4x19
+          text run at (222,249) width 4: " "
+        RenderBR {BR} at (226,264) size 0x0
+        RenderText {#text} at (0,275) size 43x19
+          text run at (0,275) width 43: "search "
+        RenderTextControl {INPUT} at (45,274) 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
-layer at (43,31) size 151x16
+layer at (45,33) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (36,53) size 151x16
+layer at (38,59) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (58,232) size 151x16
+layer at (58,253) size 151x16
   RenderBlock {DIV} at (3,3) size 151x16
-layer at (73,256) size 151x16
+layer at (75,279) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (53,278) size 151x16
-  RenderBlock {DIV} at (0,0) size 151x16
-layer at (47,170) size 129x16
-  RenderBlock (relative positioned) {DIV} at (0,0) size 129x16
+layer at (57,305) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum
new file mode 100644
index 0000000..f1134c4c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum
@@ -0,0 +1 @@
+873eb001b2fcaa19821a55af87092293
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png
new file mode 100644
index 0000000..0ee8c00
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt
new file mode 100644
index 0000000..7bb5994
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt
@@ -0,0 +1,30 @@
+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 (9,9) size 782x572

+      RenderBlock {P} at (0,0) size 782x44

+        RenderText {#text} at (0,0) size 65x21

+          text run at (0,0) width 65: "Test for "

+        RenderInline {A} at (0,0) size 359x21 [color=#0000EE]

+          RenderText {#text} at (65,0) size 359x21

+            text run at (65,0) width 359: "https://bugs.webkit.org/show_bug.cgi?id=24733"

+        RenderText {#text} at (424,0) size 4x21

+          text run at (424,0) width 4: ":"

+        RenderBR {BR} at (428,16) size 0x0

+        RenderText {#text} at (0,22) size 362x21

+          text run at (0,22) width 362: "Tests event handling on search fields with zoom."

+      RenderBlock {P} at (0,63) size 782x29

+        RenderTextControl {INPUT} at (2,2) size 184x25 [bgcolor=#FFFFFF] [border: (2px inset #000000)]

+          RenderBlock {DIV} at (3,3) size 178x19

+            RenderBlock {DIV} at (2,0) size 22x16

+            RenderBlock {DIV} at (164,5) size 11x11

+        RenderText {#text} at (0,0) size 0x0

+      RenderBlock {P} at (0,164) size 782x22

+        RenderText {#text} at (0,0) size 46x21

+          text run at (0,0) width 46: "PASS"

+layer at (41,78) size 137x19

+  RenderBlock {DIV} at (27,1) size 137x19

+    RenderText {#text} at (1,0) size 109x18

+      text run at (1,0) width 109: "Some other text"

+caret: position 15 of child 0 {#text} of child 1 {DIV} of child 0 {DIV} of child 1 {INPUT} of child 3 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt
index b9bd7f2..eb20630 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt
@@ -2,5 +2,7 @@ This tests that slider controls get mousedown, mousemove, input, and mouseup eve
 
 mousemove
 mousedown
+mousemove
 input
+mouseup
 
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-onchange-event-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-onchange-event-expected.txt
index ee561ba..0e9095c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-onchange-event-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-onchange-event-expected.txt
@@ -1,6 +1,7 @@
 This tests that slider controls get the onchange event and that it is sent after the DOMInput event.
 
 input
+change
 input
-input
+change
 
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.checksum
index faee1cd..6313181 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.checksum
@@ -1 +1 @@
-b83c5a3b6b2752f62b6d33528a732c5b
\ No newline at end of file
+87b3e6eda5169a5e4571f6c8db03f26f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.png
index f190da7..40aa284 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.txt
index 3d1e84f..4bebeba 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-padding-expected.txt
@@ -7,9 +7,8 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 307x19
           text run at (0,0) width 307: "This tests that the slider control considers padding. "
         RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,20) size 784x40 [bgcolor=#ADD8E6]
-        RenderSlider {INPUT} at (2,2) size 100x36 [bgcolor=#FFFFFF]
+      RenderBlock {DIV} at (0,20) size 784x45 [bgcolor=#ADD8E6]
+        RenderSlider {INPUT} at (2,2) size 100x41 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (10,10) size 11x21
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {PRE} at (0,73) size 784x0
-layer at (20,48) size 80x16
-  RenderBlock (relative positioned) {DIV} at (10,10) size 80x16
+      RenderBlock {PRE} at (0,78) size 784x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum
index d85fcfb..e393590 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum
@@ -1 +1 @@
-cb2a3f14b636033fc8a78249d7a2d242
\ No newline at end of file
+0059ef569ae31ce229c927b2019f82ad
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png
index 5b7ddcd..ad10fb5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.txt
index 6a27a9d..7fe508d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-shared-style-expected.txt
@@ -18,12 +18,10 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,36) size 784x20
         RenderText {#text} at (0,0) size 266x19
           text run at (0,0) width 266: "The first slider\x{2019}s thumb should be on the left."
-      RenderBlock {DIV} at (0,72) size 784x40
-        RenderSlider {INPUT} at (2,2) size 129x16 [bgcolor=#FFFFFF]
-        RenderBR {BR} at (133,18) size 0x0
-        RenderSlider {INPUT} at (2,22) size 129x16 [bgcolor=#FFFFFF]
+      RenderBlock {DIV} at (0,72) size 784x50
+        RenderSlider {INPUT} at (2,2) size 129x21 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (0,0) size 11x21
+        RenderBR {BR} at (133,23) size 0x0
+        RenderSlider {INPUT} at (2,27) size 129x21 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (118,0) size 11x21
         RenderText {#text} at (0,0) size 0x0
-layer at (10,90) size 129x16
-  RenderBlock (relative positioned) {DIV} at (0,0) size 129x16
-layer at (10,110) size 129x16
-  RenderBlock (relative positioned) {DIV} at (0,0) size 129x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-stylability-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-stylability-expected.txt
index 16667b0..03926f3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-stylability-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-thumb-stylability-expected.txt
@@ -11,8 +11,7 @@ layer at (0,0) size 800x600
           text run at (0,0) width 249: "You should see a green 20\x{D7}20px square."
       RenderBlock (anonymous) at (0,72) size 784x24
         RenderSlider {INPUT} at (2,2) size 129x20 [bgcolor=#FFFFFF]
+          RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-layer at (10,82) size 20x20
-  RenderBlock (relative positioned) {DIV} at (0,0) size 20x20 [bgcolor=#008000]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-transformed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-transformed-expected.txt
index acf9681..cc11bc9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-transformed-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-transformed-expected.txt
@@ -1,2 +1,2 @@
 
-FAIL: expected slider value 39, got 0
+PASS: slider value set to 39
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2f819e0..1ce8127 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1937,14 +1937,7 @@ BUG10462 WIN LINUX : LayoutTests/http/tests/misc/generated-content-inside-table.
 // New failures from merge
 BUG10463 WIN LINUX : LayoutTests/editing/selection/hit-test-anonymous.html = FAIL
 BUG10463 LINUX : LayoutTests/fast/clip/016.html = FAIL
-BUG10463 WIN LINUX : LayoutTests/fast/css/clip-zooming.html = FAIL
-BUG10463 WIN : LayoutTests/fast/forms/input-appearance-height.html = FAIL
 BUG10463 WIN LINUX : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
-BUG10463 WIN LINUX : LayoutTests/fast/forms/search-zoomed.html = FAIL
-BUG10463 WIN : LayoutTests/fast/forms/slider-mouse-events.html = FAIL
-BUG10463 WIN : LayoutTests/fast/forms/slider-onchange-event.html = FAIL
-BUG10463 WIN : LayoutTests/fast/forms/slider-padding.html = FAIL
-BUG10463 WIN : LayoutTests/fast/forms/slider-thumb-shared-style.html = FAIL
 BUG10463 WIN : LayoutTests/fast/forms/slider-transformed.html = FAIL
 BUG10463 WIN LINUX : LayoutTests/fast/forms/slider-zoomed.html = FAIL
 BUG10463 WIN : LayoutTests/svg/W3C-SVG-1.1/animate-elem-36-t.svg = FAIL
@@ -1973,7 +1966,7 @@ BUG10466 LINUX : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAI
 BUG10466 LINUX : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL
   
 // Needs rebaseline. See WebKit 41972.
-BUG10467 WIN LINUX : LayoutTests/fast/forms/slider-thumb-stylability.html = FAIL
+BUG10467 LINUX : LayoutTests/fast/forms/slider-thumb-stylability.html = FAIL
 
 // Needs rebaseline. See WebKit 41948
 BUG10468 MAC WIN LINUX : LayoutTests/fast/replaced/border-radius-clip.html = FAIL CRASH