rebaseline some tests from the last merge.

TBR=atwilson
BUG=none
TEST=none

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

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

18 files changed, 18 insertions, 75 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum
index 6cab511..ca1f6c9 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum
@@ -1 +1 @@
-dabb1f349ca9d1472bd79609583cc912
\ No newline at end of file
+9c62645713ba68f971a6bbd6731cda81
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
index 22b1a72..12f84ac 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum
new file mode 100644
index 0000000..a071b01
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum
@@ -0,0 +1 @@
+6ac533c941e434b36749a75eafd9c8e8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png
new file mode 100644
index 0000000..af7c17e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum
new file mode 100644
index 0000000..3b4842c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum
@@ -0,0 +1 @@
+6c3f1108ba8b9efccf95f3bf20789cd7
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png
new file mode 100644
index 0000000..8d16205
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-poster-scale-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-poster-scale-expected.txt
deleted file mode 100644
index d26f455..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-poster-scale-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-CONSOLE MESSAGE: line 24: Uncaught ReferenceError: testExpected is not defined
-layer at (0,0) size 785x619
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x619
-  RenderBlock {HTML} at (0,0) size 785x619
-    RenderBody {BODY} at (8,8) size 769x603
-      RenderText {#text} at (326,142) size 4x18
-        text run at (326,142) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (82,255) size 4x18
-        text run at (82,255) width 4: " "
-      RenderText {#text} at (168,255) size 4x18
-        text run at (168,255) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (56,585) size 4x18
-        text run at (56,585) width 4: " "
-      RenderText {#text} at (386,585) size 4x18
-        text run at (386,585) width 4: " "
-      RenderText {#text} at (716,585) size 4x18
-        text run at (716,585) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-layer at (8,8) size 326x156
-  RenderVideo {VIDEO} at (0,0) size 326x156 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (8,168) size 82x109
-  RenderVideo {VIDEO} at (0,160) size 82x109 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (94,168) size 82x109
-  RenderVideo {VIDEO} at (86,160) size 82x109 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (8,281) size 56x326
-  RenderVideo {VIDEO} at (0,273) size 56x326 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (68,361) size 326x246
-  RenderVideo {VIDEO} at (60,353) size 326x246 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (398,551) size 326x56
-  RenderVideo {VIDEO} at (390,543) size 326x56 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum
index 0b1a1f8..fa02a22 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.checksum
@@ -1 +1 @@
-926f217d562fa99ea995a6908451b418
\ No newline at end of file
+1a9acbd16e7480bd5942e45687145485
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
index 3526bb7..019f681 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.txt
index 568ba95..d6df435 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.txt
@@ -1,4 +1,4 @@
-layer at (0,0) size 785x5518
+layer at (0,0) size 785x1046
   RenderView at (0,0) size 785x600
 layer at (0,0) size 785x1046
   RenderBlock {HTML} at (0,0) size 785x1046
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum
new file mode 100644
index 0000000..950d879
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.checksum
@@ -0,0 +1 @@
+85a674ec63aacda2b0b8f62518aaf26b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png
new file mode 100644
index 0000000..1c16a90
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.txt
new file mode 100644
index 0000000..ce51b1f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar-expected.txt
@@ -0,0 +1,8 @@
+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 784x576
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 289x19
+          text run at (0,0) width 289: "This page should not have a horizontal scrollbar."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug-expected.txt
index 0732aab..0088e17 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug-expected.txt
@@ -12,5 +12,7 @@ layer at (0,0) size 785x600
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
+layer at (8,28) size 1x2000
+  RenderBlock (positioned) {DIV} at (8,28) size 1x2000
 layer at (8,500) size 100x100
   RenderBlock (positioned) {DIV} at (8,500) size 100x100 [bgcolor=#800080]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-poster-scale-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-poster-scale-expected.txt
deleted file mode 100644
index a4f84b7..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-poster-scale-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-CONSOLE MESSAGE: line 24: Uncaught ReferenceError: testExpected is not defined
-layer at (0,0) size 785x622
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x622
-  RenderBlock {HTML} at (0,0) size 785x622
-    RenderBody {BODY} at (8,8) size 769x606
-      RenderText {#text} at (326,141) size 4x19
-        text run at (326,141) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (82,255) size 4x19
-        text run at (82,255) width 4: " "
-      RenderText {#text} at (168,255) size 4x19
-        text run at (168,255) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (56,586) size 4x19
-        text run at (56,586) width 4: " "
-      RenderText {#text} at (386,586) size 4x19
-        text run at (386,586) width 4: " "
-      RenderText {#text} at (716,586) size 4x19
-        text run at (716,586) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-layer at (8,8) size 326x156
-  RenderVideo {VIDEO} at (0,0) size 326x156 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (8,169) size 82x109
-  RenderVideo {VIDEO} at (0,161) size 82x109 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (94,169) size 82x109
-  RenderVideo {VIDEO} at (86,161) size 82x109 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (8,283) size 56x326
-  RenderVideo {VIDEO} at (0,275) size 56x326 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (68,363) size 326x246
-  RenderVideo {VIDEO} at (60,355) size 326x246 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (398,553) size 326x56
-  RenderVideo {VIDEO} at (390,545) size 326x56 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/shadow-and-opacity-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/shadow-and-opacity-expected.checksum
new file mode 100644
index 0000000..1ed8800
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/shadow-and-opacity-expected.checksum
@@ -0,0 +1 @@
+acf219027d05a407752ae9c2f9d42d6d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/shadow-and-opacity-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/shadow-and-opacity-expected.png
new file mode 100644
index 0000000..0781ef7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/shadow-and-opacity-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6684b69..4c82527 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3074,15 +3074,10 @@ BUG_JOHNNYG LINUX : LayoutTests/fast/text/find-kana.html = CRASH
 // from http://trac.webkit.org/changeset/53086
 BUG_JOHNNYG : LayoutTests/svg/dynamic-updates/SVGTextElement-svgdom-rotate-prop.html = TEXT
 
-// a bunch of tests broken before the flakiness fix, i will deal with these 
+// a bunch of tests broken before the flakiness fix, i will deal with these
 // after the major flakiness goes away
 BUG_JOHNNYG : LayoutTests/fast/js/Object-getOwnPropertyNames.html = TEXT
-BUG_JOHNNYG : LayoutTests/svg/css/shadow-and-opacity.svg = IMAGE
-BUG_JOHNNYG WIN LINUX : LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed.html = IMAGE+TEXT
 BUG_JOHNNYG : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = TIMEOUT
-BUG_JOHNNYG WIN : LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug.html = TEXT
-BUG_JOHNNYG : LayoutTests/fast/block/positioning/absolute-positioning-no-scrollbar.html = MISSING
-BUG_JOHNNYG : LayoutTests/media/video-poster-scale.html = TEXT
 BUG_JOHNNYG : LayoutTests/storage/multiple-databases-garbage-collection.html = CRASH PASS
 
 // New flakiness?