Update test_expectations.txt after webkit merge

TBR=nsylvian
BUG=13901

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

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

7 files changed, 56 insertions, 0 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.checksum
new file mode 100644
index 0000000..ba8318f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.checksum
@@ -0,0 +1 @@
+a0af278a5de7b97bd7355605641266f4
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.png
new file mode 100644
index 0000000..b572bb3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.txt
new file mode 100644
index 0000000..c4552a9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/pseudo-cache-stale-expected.txt
@@ -0,0 +1,26 @@
+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 {DIV} at (0,0) size 784x37
+        RenderInline (generated) at (0,0) size 19x36
+          RenderText {#text} at (0,0) size 19x36
+            text run at (0,0) width 19: "T"
+        RenderText {#text} at (19,13) size 349x19
+          text run at (19,13) width 349: "he first letter in this sentence should be larger than the rest."
+      RenderBlock {DIV} at (0,37) size 784x20
+        RenderText {#text} at (0,0) size 252x36
+          text run at (0,0) width 252: "This sentence should be extra-extra-large."
+      RenderBlock (anonymous) at (0,57) 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
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (14,70) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16 [color=#008000]
+    RenderText {#text} at (1,0) size 120x16
+      text run at (1,0) width 120: "This should be green"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.checksum
new file mode 100644
index 0000000..78215b0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.checksum
@@ -0,0 +1 @@
+1a9102ff868460a024fb0729bd4cac6f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.png
new file mode 100644
index 0000000..f36e277
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.txt
new file mode 100644
index 0000000..c4552a9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/pseudo-cache-stale-expected.txt
@@ -0,0 +1,26 @@
+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 {DIV} at (0,0) size 784x37
+        RenderInline (generated) at (0,0) size 19x36
+          RenderText {#text} at (0,0) size 19x36
+            text run at (0,0) width 19: "T"
+        RenderText {#text} at (19,13) size 349x19
+          text run at (19,13) width 349: "he first letter in this sentence should be larger than the rest."
+      RenderBlock {DIV} at (0,37) size 784x20
+        RenderText {#text} at (0,0) size 252x36
+          text run at (0,0) width 252: "This sentence should be extra-extra-large."
+      RenderBlock (anonymous) at (0,57) 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
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (14,70) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16 [color=#008000]
+    RenderText {#text} at (1,0) size 120x16
+      text run at (1,0) width 120: "This should be green"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index cf6e5a9..72a4ce5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -656,6 +656,8 @@ BUG13907 WIN : LayoutTests/media/video-src-remove.html = FAIL
 // These tests are flaky.
 BUG13097 WIN : LayoutTests/media/video-display-toggle.html = FAIL
 BUG13907 WIN : LayoutTests/media/controls-styling.html = FAIL
+// This test is added in WebKit merge 45610:45621
+BUG13907 WIN : LayoutTests/media/controls-after-reload.html = TIMEOUT
 
 // Function arguments object is copied for each access.
 BUG941049 : LayoutTests/fast/js/kde/function_arguments.html = FAIL