New baselines for tests modified in merge 42324:42364. These were similarly

rebaselined upstream.

Updates to test_expectations for fixes after that merge.

BUG=9924
TEST=covered by layout tests
Review URL: http://codereview.chromium.org/67047

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

9 files changed, 40 insertions, 41 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.checksum
index f74c43d..cbeb3d5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.checksum
@@ -1 +1 @@
-3543ba84a4cb72f0131cfb66ebaa6a19
\ No newline at end of file
+1ae7c4d318eb5b8bf42f649dc1434889
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.png
index 8802468..1520295 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.txt
index 85ec529..a176723 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/016-expected.txt
@@ -1,9 +1,9 @@
-layer at (0,0) size 812x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 812x600
-  RenderBlock {HTML} at (0,0) size 800x600 [bgcolor=#FFFFFF]
-    RenderBody {BODY} at (0,0) size 800x600
-      RenderFlexibleBox {DIV} at (0,0) size 800x600
+layer at (0,0) size 812x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 812x585
+  RenderBlock {HTML} at (0,0) size 800x585 [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (0,0) size 800x585
+      RenderFlexibleBox {DIV} at (0,0) size 800x585
         RenderBlock {DIV} at (0,0) size 800x40
           RenderText {#text} at (0,0) size 796x39
             text run at (0,0) width 462: "This header should remain at the top of the browser window as you resize it. "
@@ -11,13 +11,13 @@ layer at (0,0) size 812x600
             text run at (635,0) width 158: "The center should be filled"
             text run at (0,20) width 209: "with an olive-bordered green box. "
             text run at (209,20) width 587: "It should start beneath the header, end above the footer, and fill the width of the browser window."
-        RenderPartObject {IFRAME} at (0,40) size 812x540 [bgcolor=#008000] [border: (10px solid #808000)]
-          layer at (0,0) size 792x520
-            RenderView at (0,0) size 792x520
-          layer at (0,0) size 792x520
-            RenderBlock {HTML} at (0,0) size 792x520
-              RenderBody {BODY} at (8,8) size 776x504
-        RenderBlock {DIV} at (0,580) size 800x20
+        RenderPartObject {IFRAME} at (0,40) size 812x525 [bgcolor=#008000] [border: (10px solid #808000)]
+          layer at (0,0) size 792x505
+            RenderView at (0,0) size 792x505
+          layer at (0,0) size 792x505
+            RenderBlock {HTML} at (0,0) size 792x505
+              RenderBody {BODY} at (8,8) size 776x489
+        RenderBlock {DIV} at (0,565) size 800x20
           RenderText {#text} at (0,0) size 631x19
             text run at (0,0) width 388: "This footer should remain at the bottom of the browser window. "
             text run at (388,0) width 243: "It can wrap to multiple lines if necessary."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.checksum
index a18cc18..d784bf9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.checksum
@@ -1 +1 @@
-d2e8db02423c322533cc7a338be6af28
\ No newline at end of file
+4eea2e3ca7d38740fc7a3aa4db83da2c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.png
index ade6410..68c4c06 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/flexbox/flex-hang-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.checksum
index a31bac2..93cac8ce 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.checksum
@@ -1 +1 @@
-590e47b9b7a92b1c180b93bdb33e74b5
\ No newline at end of file
+42e1b54f2522d89b4e3cfc639bcfb269
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.png
index 0020cd8..4e9c3f2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.txt
index ee0e0ea..7964321 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/001-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 810x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 810x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
+layer at (0,0) size 810x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 810x585
+  RenderBlock {HTML} at (0,0) size 800x585
+    RenderBody {BODY} at (8,8) size 784x561
       RenderBlock {DIV} at (0,0) size 784x108 [border: (3px solid #FFA500)]
         RenderBlock (floating) {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
         RenderListItem {DIV} at (11,11) size 762x86 [border: (3px solid #FFA500)]
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index dd40800..79d792b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1305,6 +1305,11 @@ LINUX : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
 // Windows is missing the green box.
 BUG8729 DEFER WIN : LayoutTests/http/tests/multipart/invalid-image-data.html = FAIL
 
+// This is a repaint test. When it passes, the pixel results will show a white
+// background for only the last couple of lines, instead of the whole
+// paragraph.  New test in merge 42324:42364.
+BUG9962 : LayoutTests/fast/repaint/text-append-dirty-lines.html = FAIL
+
 // -----------------------------------------------------------------
 // MAC PORT TESTS
 // -----------------------------------------------------------------
@@ -2442,26 +2447,20 @@ BUG9916 : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = FAIL
 BUG9916 : LayoutTests/svg/custom/getsvgdocument.html = FAIL
 BUG9916 : LayoutTests/transitions/transition-end-event-left.html = FAIL
 
-// Started failing with WebKit merge 42324:42364. Probably just need
-// re-baselining, since WebKit re-baselined them in that range.
-// TODO(pamg): investigate.
-BUG9924 : LayoutTests/fast/flexbox/016.html = FAIL
-BUG9924 RELEASE : LayoutTests/fast/flexbox/flex-hang.html = FAIL
-BUG9924 WIN MAC : LayoutTests/fast/lists/001.html = FAIL
-
 // Started failing with WebKit merge 42324:42364. Unknown cause.
 BUG9926 WIN LINUX : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
 
-// New tests from WebKit merge 42324:42364. May just need re-baselining.
-// TODO(pamg): investigate.
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html = FAIL
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow.html = FAIL
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html = FAIL
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag.html = FAIL
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny.html = FAIL
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html = FAIL
-BUG9962 : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html = FAIL
-BUG9962 : LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug.html = FAIL
-BUG9962 : LayoutTests/fast/js/function-apply-aliased.html = FAIL
-BUG9962 : LayoutTests/fast/repaint/text-append-dirty-lines.html = FAIL
-BUG9962 LINUX : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL
+// New tests or failures from WebKit merge 42324:42364. Re-baselined on
+// Windows. Probably just need the same on other platforms.
+BUG9924 MAC LINUX : LayoutTests/fast/flexbox/016.html = FAIL
+BUG9924 MAC LINUX RELEASE : LayoutTests/fast/flexbox/flex-hang.html = FAIL
+BUG9924 MAC : LayoutTests/fast/lists/001.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/fast/js/function-apply-aliased.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html = FAIL
+BUG9962 MAC LINUX : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html = FAIL