Re-baseline tests that are producing correct/acceptable results on Windows.

BUG=15217, 4363, 9798, 18978
TEST=covered by layout tests
Review URL: http://codereview.chromium.org/164292

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

8 files changed, 80 insertions, 16 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/switch-behaviour-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/switch-behaviour-expected.txt
index a58e103..0904d82 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/switch-behaviour-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/switch-behaviour-expected.txt
@@ -9,7 +9,7 @@ PASS characterSwitch('a') is "a"
 PASS characterSwitch('1') is "1"
 PASS characterSwitch('-1') is "default"
 PASS characterSwitch('B') is "B"
-PASS characterSwitch('') is "default"
+PASS characterSwitch('￿') is "default"
 PASS characterSwitch({toString: function(){return 'B'}}) is "default"
 PASS characterSwitch(0) is "default"
 PASS characterSwitch(-0) is "default"
@@ -25,7 +25,7 @@ PASS sparseCharacterSwitch('a') is "a"
 PASS sparseCharacterSwitch('1') is "1"
 PASS sparseCharacterSwitch('-1') is "default"
 PASS sparseCharacterSwitch('B') is "B"
-PASS sparseCharacterSwitch('') is ""
+PASS sparseCharacterSwitch('￿') is "￿"
 PASS sparseCharacterSwitch({toString: function(){return 'B'}}) is "default"
 PASS sparseCharacterSwitch(0) is "default"
 PASS sparseCharacterSwitch(-0) is "default"
@@ -41,7 +41,7 @@ PASS stringSwitch('a') is "a"
 PASS stringSwitch('1') is "1"
 PASS stringSwitch('-1') is "-1"
 PASS stringSwitch('B') is "B"
-PASS stringSwitch('') is ""
+PASS stringSwitch('￿') is "￿"
 PASS stringSwitch('some string') is "some string"
 PASS stringSwitch({toString: function(){return 'some string'}}) is "default"
 PASS stringSwitch('s') is "default"
@@ -59,7 +59,7 @@ PASS numberSwitch('a') is "default"
 PASS numberSwitch('1') is "default"
 PASS numberSwitch('-1') is "default"
 PASS numberSwitch('B') is "default"
-PASS numberSwitch('') is "default"
+PASS numberSwitch('￿') is "default"
 PASS numberSwitch('some string') is "default"
 PASS numberSwitch({valueOf: function(){return 0}}) is "default"
 PASS numberSwitch('s') is "default"
@@ -77,7 +77,7 @@ PASS sparseNumberSwitch('a') is "default"
 PASS sparseNumberSwitch('1') is "default"
 PASS sparseNumberSwitch('-1') is "default"
 PASS sparseNumberSwitch('B') is "default"
-PASS sparseNumberSwitch('') is "default"
+PASS sparseNumberSwitch('￿') is "default"
 PASS sparseNumberSwitch('some string') is "default"
 PASS sparseNumberSwitch({valueOf: function(){return 0}}) is "default"
 PASS sparseNumberSwitch('s') is "default"
@@ -95,7 +95,7 @@ PASS generalSwitch('a') is "a"
 PASS generalSwitch('1') is "1"
 PASS generalSwitch('-1') is "-1"
 PASS generalSwitch('B') is "B"
-PASS generalSwitch('') is ""
+PASS generalSwitch('￿') is "￿"
 PASS generalSwitch('some string') is "some string"
 PASS generalSwitch({valueOf: function(){return 0}}) is "default"
 PASS generalSwitch('s') is "default"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.checksum
new file mode 100644
index 0000000..31e2efa2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.checksum
@@ -0,0 +1 @@
+c065b238a3d006a3242750da9eb08ede
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.png
new file mode 100644
index 0000000..735fd9d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.txt
new file mode 100644
index 0000000..83487d2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/video-layer-expected.txt
@@ -0,0 +1,36 @@
+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 784x40
+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 291x19
+            text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=25066"
+        RenderBR {BR} at (291,15) size 0x0
+        RenderText {#text} at (0,20) size 396x19
+          text run at (0,20) width 396: "controls should not be misplaced when video gets a RenderLayer."
+      RenderBlock (anonymous) at (0,56) size 784x252
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (58,114) size 302x152
+  RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
+layer at (59,115) size 300x150
+  RenderBlock (relative positioned) {DIV} at (1,1) size 300x150
+layer at (59,233) size 300x32
+  RenderFlexibleBox (positioned) {DIV} at (0,118) size 300x32 [bgcolor=#00000099]
+layer at (325,233) size 34x32
+  RenderButton {INPUT} at (266,0) size 34x32
+layer at (66,239) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (89,233) size 236x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32
+layer at (267,239) size 58x20
+  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (95,241) size 165x23
+  RenderSlider {INPUT} at (6,8) size 165x16 [color=#328CDF] [bgcolor=#FFFFFF14]
+    RenderBlock {DIV} at (2,-6) size 9x29
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.checksum
index b1dd95a..48d06ad 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.checksum
@@ -1 +1 @@
-a9c140e405515c63e5246b71eec67a71
\ No newline at end of file
+b347baba034bec534f8c3dede129b8eb
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.png
index 5ddc6e5..0d7e8d6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/inlineBoxWrapperNullCheck-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/xmlhttprequest/cache-override-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/xmlhttprequest/cache-override-expected.txt
new file mode 100644
index 0000000..417547a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/xmlhttprequest/cache-override-expected.txt
@@ -0,0 +1,28 @@
+Tests for bug 8210 - Conditional XMLHttpRequest gets should pass 304 responses unchanged.
+
+Fetching the resource once to cache the response...
+Automatically cached response body is correct; status = 200
+If-Modified-Since override: status = 304
+If-MODIFIED-Since override: status = 304
+If-Modified-Since override (modified): status = 200
+If-Unmodified-Since override: status = 200
+If-Unmodified-Since override (modified): status = 200
+If-Match override: status = 200
+If-Match override (none match): status = 200
+If-None-Match override: status = 304
+If-None-Match override (none match): status = 200
+If-Range override: status = 206
+If-Range override (none match): status = 200
+If-Modified-Since override (uncached response): status = 304
+async: Automatically cached response body is correct; status = 200
+async: If-Modified-Since override: status = 304
+async: If-Modified-Since override (modified): status = 200
+async: If-Unmodified-Since override: status = 200
+async: If-Unmodified-Since override (modified): status = 200
+async: If-Match override: status = 200
+async: If-Match override (none match): status = 200
+async: If-None-Match override: status = 304
+async: If-None-Match override (none match): status = 200
+async: If-Range override: status = 206
+async: If-Range override (none match): status = 200
+async: If-Modified-Since override (uncached response): status = 304
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 94ea155..e27d20a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -393,18 +393,18 @@ BUG877986 WIN LINUX : LayoutTests/css2.1/t1204-reset-01-c-o.html = FAIL
 // TODO(deanm): Address all of these via lighttpd if possible, otherwise fork.
 // Maybe flaky and need to be forked?
 // Difference in caching headers
-BUG1234761 : LayoutTests/http/tests/xmlhttprequest/cache-override.html = FAIL
+BUG18978 MAC LINUX : LayoutTests/http/tests/xmlhttprequest/cache-override.html = FAIL
 // LightTPD doesn't accept unknown HTTP methods
-BUG1234761 SKIP : LayoutTests/http/tests/xmlhttprequest/methods-lower-case.html = TIMEOUT CRASH
-BUG1234761 : LayoutTests/http/tests/xmlhttprequest/methods-async.html = FAIL TIMEOUT
-BUG1234761 WIN LINUX MAC : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html = FAIL TIMEOUT PASS
+BUG18978 SKIP : LayoutTests/http/tests/xmlhttprequest/methods-lower-case.html = TIMEOUT CRASH
+BUG18978 : LayoutTests/http/tests/xmlhttprequest/methods-async.html = FAIL TIMEOUT
+BUG18978 WIN LINUX MAC : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html = FAIL TIMEOUT PASS
 // LightTPD doesn't accept unknown HTTP methods and passes CGIs a Content-Type
 // even when a request didn't send the header.
-BUG1234761 : LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL TIMEOUT CRASH
+BUG18978 : LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL TIMEOUT CRASH
 // This passes when run in Chrome. It appears to be because of a difference
 // in how lighttpd serves up the svn resource image (or the image
 // contained in the svg image).
-BUG1234761 : LayoutTests/http/tests/security/canvas-remote-read-svg-image.html = FAIL
+BUG18978 : LayoutTests/http/tests/security/canvas-remote-read-svg-image.html = FAIL
 // Another lighttpd quirk.
 BUG8941 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL
 BUG8941 MAC : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL TIMEOUT
@@ -2120,7 +2120,6 @@ BUG9798 MAC : LayoutTests/transitions/transition-timing-function.html = FAIL PAS
 BUG9798 MAC DEBUG : LayoutTests/fast/body-propagation/overflow/004-xhtml.xhtml = FAIL PASS
 BUG9798 WIN : LayoutTests/fast/dom/Window/window-lookup-precedence.html = TIMEOUT PASS CRASH
 BUG9798 WIN : LayoutTests/fast/events/tabindex-focus-blur-all.html = FAIL PASS TIMEOUT
-BUG9798 WIN : LayoutTests/fast/lists/inlineBoxWrapperNullCheck.html = FAIL PASS
 BUG9798 WIN : LayoutTests/fast/xmlhttprequest/xmlhttprequest-gc.html = CRASH PASS
 BUG9798 WIN : LayoutTests/http/tests/mime/standard-mode-loads-stylesheet-with-charset-and-css-extension.html = TIMEOUT PASS
 BUG9798 WIN : LayoutTests/http/tests/mime/standard-mode-loads-stylesheet-with-charset.html = TIMEOUT PASS
@@ -2206,7 +2205,7 @@ BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.h
 BUG11122 LINUX : LayoutTests/fast/forms/caret-rtl.html = FAIL
 
 // New tests from WebKit Merge 42609:42671
-BUG4363 : LayoutTests/fast/layers/video-layer.html = FAIL
+BUG4363 MAC LINUX : LayoutTests/fast/layers/video-layer.html = FAIL
 BUG10760 LINUX : LayoutTests/fast/forms/input-text-scroll-left-on-blur.html = FAIL
 BUG10760 LINUX : LayoutTests/fast/inline/25277-2.html = FAIL	
 BUG10760 LINUX : LayoutTests/fast/inline/25277.html = FAIL
@@ -2482,7 +2481,7 @@ BUG15125 MAC SKIP : chrome/fast/text/fake-italic.html = FAIL
 BUG15217 : LayoutTests/fast/events/drag-to-navigate.html = TIMEOUT FAIL
 BUG15217 : LayoutTests/fast/js/dictionary-no-cache.html = FAIL
 BUG15217 : LayoutTests/fast/events/prevent-drag-to-navigate.html = TIMEOUT
-BUG15217 : LayoutTests/fast/js/switch-behaviour.html = FAIL
+BUG15217 MAC LINUX : LayoutTests/fast/js/switch-behaviour.html = FAIL
 
 // WebKit 45086:45111
 BUG15270 LINUX WIN : LayoutTests/svg/custom/js-update-image-and-display.svg = FAIL