Rebase some layout tests.

* LayoutTests/fast/frames/frame-src-attribute.html

Actual results match mac baseline; probably an out-dated chromium-baseline.

* LayoutTests/fast/forms/listbox-scrollbar-incremental-load.html

Had no chromium baseline; matches mac baseline.
Review URL: http://codereview.chromium.org/16588

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

7 files changed, 58 insertions, 7 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.checksum
new file mode 100644
index 0000000..aabce31
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.checksum
@@ -0,0 +1 @@
+246017cda77f0bc94a7bc35c92941d72
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.png
new file mode 100644
index 0000000..f8bd708
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.txt
new file mode 100644
index 0000000..e86857f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-scrollbar-incremental-load-expected.txt
@@ -0,0 +1,27 @@
+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
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Test for "
+        RenderInline {I} at (0,0) size 772x39
+          RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
+            RenderText {#text} at (51,0) size 305x19
+              text run at (51,0) width 305: "http://bugs.webkit.org/show_bug.cgi?id=13500"
+          RenderText {#text} at (356,0) size 772x39
+            text run at (356,0) width 4: " "
+            text run at (360,0) width 412: "REGRESSION: Listbox scrollbar does not reflect actual scrolled"
+            text run at (0,20) width 325: "position when selected option is added after layout"
+        RenderText {#text} at (325,20) size 4x19
+          text run at (325,20) width 4: "."
+      RenderBlock {P} at (0,56) size 784x40
+        RenderText {#text} at (0,0) size 779x39
+          text run at (0,0) width 467: "The list box should be scrolled all the way down, showing the selected option "
+          text run at (467,0) width 312: "\x{201C}Seven\x{201D}. The scroller should be at the bottom of the"
+          text run at (0,20) width 60: "scroll bar "
+          text run at (60,20) width 81: "to reflect this."
+      RenderBlock (anonymous) at (0,112) size 784x69
+        RenderListBox {SELECT} at (0,0) size 52x69 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+        RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum
index e3390ab..0ac6219 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum
@@ -1 +1 @@
-262c4c8c38d62c2b02f3ebd72258146c
\ No newline at end of file
+faf27f6924fe3411f3275fa7b12f489c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png
index 01b7e85..27222a4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt
new file mode 100644
index 0000000..4effcb0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt
@@ -0,0 +1,23 @@
+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
+    RenderFrameSet {FRAMESET} at (0,0) size 800x600
+      RenderFrame {FRAME} at (0,0) size 800x600
+        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 784x579
+              RenderBlock {P} at (0,0) size 784x20
+                RenderText {#text} at (0,0) size 581x19
+                  text run at (0,0) width 581: "This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL."
+              RenderBlock {PRE} at (0,36) size 784x16
+                RenderText {#text} at (0,0) size 624x16
+                  text run at (0,0) width 624: "PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does."
+      RenderFrame {FRAME} at (0,0) size 0x0
+        layer at (0,0) size 8x8
+          RenderView at (0,0) size 0x0
+        layer at (0,0) size 8x8
+          RenderBlock {HTML} at (0,0) size 0x8
+            RenderBody {BODY} at (8,8) size 0x0
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 79b33d2..2f9facc 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -790,7 +790,7 @@ WIN : LayoutTests/svg/W3C-SVG-1.1/fonts-kern-01-t.svg = FAIL
 // to access non-file urls.
 DEFER LINUX WIN : LayoutTests/editing/selection/4960137.html = FAIL
 DEFER : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
-DEFER LINUX WIN : LayoutTests/fast/frames/frame-src-attribute.html = FAIL
+DEFER LINUX : LayoutTests/fast/frames/frame-src-attribute.html = FAIL
 
 // Bug: 1045048
 // We haven't implemented GCController in test shell
@@ -1257,7 +1257,7 @@ LayoutTests/fast/forms/form-element-geometry.html = FAIL
 // the scrollbar looks too narrow.
 LINUX WIN : LayoutTests/fast/forms/listbox-deselect-scroll.html = FAIL
 // The thumb in the scrollbar looks too narrow.
-LINUX WIN : LayoutTests/fast/forms/listbox-scrollbar-incremental-load.html = FAIL
+LINUX : LayoutTests/fast/forms/listbox-scrollbar-incremental-load.html = FAIL
 LINUX WIN : LayoutTests/fast/forms/listbox-selection-2.html = FAIL
 // Thumb is the wrong size and this test doesn't work on Windows due to font
 // sizes.
@@ -1824,10 +1824,10 @@ LINUX WIN : LayoutTests/fast/forms/select-baseline.html = FAIL
 
 // These test the behavior of the (x) in type=search inputs.  We haven't
 // implemented this yet (should we on win/linux?). http://crbug.com/5701
-LINUX WIN : LayoutTests/fast/forms/search-cancel-button-mouseup.html = FAIL
-LayoutTests/fast/forms/search-cancel-button-style-sharing.html = FAIL
-LayoutTests/fast/forms/search-rtl.html = FAIL
-LayoutTests/fast/forms/search-transformed.html = FAIL
+DEFER LINUX WIN : LayoutTests/fast/forms/search-cancel-button-mouseup.html = FAIL
+DEFER : LayoutTests/fast/forms/search-cancel-button-style-sharing.html = FAIL
+DEFER : LayoutTests/fast/forms/search-rtl.html = FAIL
+DEFER : LayoutTests/fast/forms/search-transformed.html = FAIL
 
 // Merge 39369:39410: new test
 LayoutTests/fast/events/popup-blocking-click-in-iframe.html = TIMEOUT