Rebaseline Linux slider tests.

After https://bugs.webkit.org/show_bug.cgi?id=28928 lands, this
updates the test expectations to include the new slider.

BUG=20265

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


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

8 files changed, 42 insertions, 70 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.checksum
index e3098c2..d88a3f2 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.checksum
@@ -1 +1 @@
-b39894c40d260b0c99988ef99d8dcc8a
\ No newline at end of file
+879597b733bad2b03f3cc9a24603ee41
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.png
index 4669665..1eaa665 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt
index f4cd225..c51ea01 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-appearance-height-expected.txt
@@ -6,7 +6,7 @@ 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 784x290
+      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)]
@@ -47,46 +47,46 @@ layer at (0,0) size 800x600
         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,140) size 37x19
-          text run at (0,140) width 37: "range "
-        RenderSlider {INPUT} at (39,155) size 129x0 [bgcolor=#FFFFFF]
-          RenderBlock {DIV} at (64,0) size 0x0
-        RenderText {#text} at (170,140) size 4x19
-          text run at (170,140) width 4: " "
-        RenderBR {BR} at (174,155) size 0x0
-        RenderText {#text} at (0,163) size 33x19
-          text run at (0,163) width 33: "reset "
-        RenderButton {INPUT} at (35,162) size 56x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+        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=#DDDDDD] [border: (2px outset #DDDDDD)]
           RenderBlock (anonymous) at (8,2) size 40x18
             RenderText at (3,1) size 34x16
               text run at (3,1) width 34: "Reset"
-        RenderText {#text} at (93,163) size 4x19
-          text run at (93,163) width 4: " "
-        RenderBR {BR} at (97,178) size 0x0
-        RenderText {#text} at (0,189) size 43x19
-          text run at (0,189) width 43: "submit "
-        RenderButton {INPUT} at (45,188) size 63x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
+        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=#DDDDDD] [border: (2px outset #DDDDDD)]
           RenderBlock (anonymous) at (8,2) size 47x18
             RenderText at (3,1) size 41x16
               text run at (3,1) width 41: "Submit"
-        RenderText {#text} at (110,189) size 4x19
-          text run at (110,189) width 4: " "
-        RenderBR {BR} at (114,204) size 0x0
-        RenderText {#text} at (0,215) size 45x19
-          text run at (0,215) width 45: "isindex "
-        RenderTextControl {INPUT} at (47,214) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (206,215) size 4x19
-          text run at (206,215) width 4: " "
-        RenderBR {BR} at (210,230) size 0x0
-        RenderText {#text} at (0,241) size 63x19
-          text run at (0,241) width 63: "password "
-        RenderTextControl {INPUT} at (65,240) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (222,241) size 4x19
-          text run at (222,241) width 4: " "
-        RenderBR {BR} at (226,256) size 0x0
-        RenderText {#text} at (0,267) size 43x19
-          text run at (0,267) width 43: "search "
-        RenderTextControl {INPUT} at (45,266) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        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
@@ -95,9 +95,9 @@ layer at (45,33) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
 layer at (38,59) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (58,245) size 151x16
+layer at (58,253) size 151x16
   RenderBlock {DIV} at (3,3) size 151x16
-layer at (75,271) size 151x16
+layer at (75,279) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (57,297) size 138x16
+layer at (57,305) size 138x16
   RenderBlock {DIV} at (1,0) size 138x16
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.checksum
index ed9f34b..19fdcad 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.checksum
@@ -1 +1 @@
-6802b7a5f3d41f65ef1a63d745464a15
\ No newline at end of file
+ec12cfbb72299d2085f8534a31c85b1d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.png
index 3a3b946..265e6269 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-padding-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum
index 9036a27..b91b415 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.checksum
@@ -1 +1 @@
-3c1b30d0faa8b2481b584c154014ae97
\ No newline at end of file
+e87ec395c21516f4c33df46e5dd4e8be
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png
index 7104139..7f8f7d5f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/slider-thumb-shared-style-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 12925e1..95fa67c 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1709,8 +1709,7 @@ BUG10461 SKIP : LayoutTests/platform/mac/fast/text/international/Geeza-Pro-verti
 // New failures from merge
 BUG10463 WIN LINUX : LayoutTests/editing/selection/hit-test-anonymous.html = FAIL
 BUG10463 WIN LINUX : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
-BUG10463 WIN : LayoutTests/fast/forms/slider-zoomed.html = FAIL
-BUG10463 LINUX : LayoutTests/fast/forms/slider-zoomed.html = CRASH
+BUG10463 WIN LINUX : LayoutTests/fast/forms/slider-zoomed.html = FAIL
 
 // New tests, need Chromium baseline.
 BUG10465 LINUX : LayoutTests/fast/borders/border-image-border-radius.html = FAIL
@@ -1720,16 +1719,6 @@ BUG10465 LINUX : LayoutTests/fast/clip/overflow-border-radius-clip.html = FAIL
 BUG10468 MAC : LayoutTests/fast/replaced/border-radius-clip.html = FAIL
 BUG10468 WIN DEBUG : LayoutTests/fast/replaced/border-radius-clip.html = FAIL
 
-// Merge WebKit: 41944:41999, Linux failures.
-// Merge WebKit:  47748:47759, Linux crashes.
-BUG10471 BUG20265 LINUX : LayoutTests/fast/events/tabindex-focus-blur-all.html = FAIL CRASH
-BUG10471 BUG20265 LINUX : LayoutTests/fast/forms/focus2.html = FAIL CRASH
-BUG10471 BUG20265 LINUX : LayoutTests/fast/forms/slider-mouse-events.html = FAIL CRASH
-BUG10471 BUG20265 LINUX : LayoutTests/fast/forms/slider-onchange-event.html = FAIL CRASH
-BUG10471 BUG20265 LINUX : LayoutTests/fast/forms/slider-padding.html = FAIL CRASH
-BUG10471 BUG20265 LINUX : LayoutTests/fast/forms/slider-thumb-shared-style.html = FAIL CRASH
-BUG10471 BUG20265 LINUX : LayoutTests/fast/forms/slider-transformed.html = FAIL CRASH
-
 // Mac flaky failures.
 BUG10472 MAC : LayoutTests/svg/css/glyph-orientation-rounding-test.xhtml = FAIL PASS
 
@@ -2073,12 +2062,6 @@ BUG11613 MAC : LayoutTests/http/tests/security/cross-frame-access-call.html = FA
 // WebKit merge 45601:45610
 BUG16162 : LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html = FAIL
 
-// WebKit merge 45635:45640
-
-// WebKit merge 45659:45664, failure
-// WebKit merge 47748:47759, crash
-BUG16355 BUG20265 LINUX : LayoutTests/fast/forms/slider-delete-while-dragging-thumb.html = FAIL CRASH
-
 // Tests that rely on cross-process MessagePorts.  No point in running them in
 // test_shell, since we'd have to use a completely different implementation from
 // what is used in the browser.
@@ -2216,10 +2199,6 @@ BUG17398 LINUX : LayoutTests/fast/borders/borderRadiusDashed03.html = FAIL
 BUG17398 LINUX : LayoutTests/fast/css/pseudo-cache-stale.html = FAIL
 BUG17398 LINUX : LayoutTests/fast/forms/search-zoomed.html = FAIL
 
-// Test failure from WebKit merge r46143:46194
-// Test crash from WebKit merge r47748:47759
-BUG17398 BUG20265 LINUX : LayoutTests/fast/forms/input-appearance-height.html = CRASH
-
 // Test failures from WebKit merge r46194:46229
 BUG17497 WIN DEBUG : LayoutTests/media/unsupported-rtsp.html = FAIL
 BUG17499 MAC : LayoutTests/platform/mac/fast/loader/non-html-load-event.html = FAIL
@@ -2293,13 +2272,6 @@ BUG20341 : LayoutTests/loader/go-back-to-different-window-size.html = TIMEOUT
 // WebKit 47732:47748.
 BUG20324 : LayoutTests/http/tests/security/javascriptURL/javascriptURL-in-new-iframe.html = CRASH
 
-// WebKit 47748:47759. Crash only on Linux. Need investigation.
-BUG20265 LINUX : LayoutTests/fast/css/pseudo-required-optional-005.html = CRASH
-BUG20265 LINUX : LayoutTests/fast/forms/ValidityState-valueMissing-005.html = CRASH
-BUG20265 LINUX : LayoutTests/fast/forms/range-default-value.html = CRASH
-BUG20265 LINUX : LayoutTests/fast/forms/range-reset.html = CRASH
-BUG20265 LINUX : LayoutTests/platform/mac/accessibility/slider-supports-actions.html = CRASH FAIL
-
 // WebKit 47777:47790 - getOwnPropertyDescriptor
 BUG20345 : LayoutTests/fast/js/getOwnPropertyDescriptor.html = FAIL