Rebaseline a few more repaint tests.

The difference in upstream repaint areas as compared to upstream results is due the difference in repaint logic.
Safari/Mac port uses NSView's native rectangle collection/unification, and we just unify all into one damage rect.

R=jparent
BUG=8630
TEST=none

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

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

14 files changed, 54 insertions, 6 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.checksum
new file mode 100644
index 0000000..b701058
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.checksum
@@ -0,0 +1 @@
+1433411ceb77d953c66d14b7409ac9ca
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.png
new file mode 100644
index 0000000..c6ad60b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.txt
new file mode 100644
index 0000000..3a12c16
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/hidden-listbox-expected.txt
@@ -0,0 +1,10 @@
+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
+      RenderText {#text} at (0,0) size 479x19
+        text run at (0,0) width 479: "This tests that the whole listbox control is hidden when visibility is set to hidden. "
+      RenderBR {BR} at (479,15) size 0x0
+      RenderListBox {SELECT} at (2,22) size 192x69 [bgcolor=#DDDDDD] [border: (1px inset #808080)]
+      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/selected-replaced-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/selected-replaced-expected.checksum
new file mode 100644
index 0000000..610d7f2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/selected-replaced-expected.checksum
@@ -0,0 +1 @@
+d6a5827ade91455614d0560cab0fced6
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/selected-replaced-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/selected-replaced-expected.png
new file mode 100644
index 0000000..832d03f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/selected-replaced-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.checksum
new file mode 100644
index 0000000..85fdc14
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.checksum
@@ -0,0 +1 @@
+931b7daea25ad4e2559c79afd57f6984
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.png
new file mode 100644
index 0000000..4e35d1d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.txt
new file mode 100644
index 0000000..3abc980
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/hidden-listbox-expected.txt
@@ -0,0 +1,10 @@
+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
+      RenderText {#text} at (0,0) size 479x19
+        text run at (0,0) width 479: "This tests that the whole listbox control is hidden when visibility is set to hidden. "
+      RenderBR {BR} at (479,15) size 0x0
+      RenderListBox {SELECT} at (2,22) size 192x69 [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/forms/listbox-clip-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-clip-expected.checksum
new file mode 100644
index 0000000..08788dd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-clip-expected.checksum
@@ -0,0 +1 @@
+e883dd6c168eda7f05b66bad6e7dee42
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-clip-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-clip-expected.png
new file mode 100644
index 0000000..bd1aa56
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/listbox-clip-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.checksum
new file mode 100644
index 0000000..2ccde71
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.checksum
@@ -0,0 +1 @@
+3fae9debe2492fd05e9caef4f2fea0ac
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.png
new file mode 100644
index 0000000..8806a4e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.txt
new file mode 100644
index 0000000..726f577
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selected-replaced-expected.txt
@@ -0,0 +1,24 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x297
+  RenderBlock {HTML} at (0,0) size 800x297
+    RenderBody {BODY} at (8,16) size 784x273
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Test for "
+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]
+          RenderText {#text} at (51,0) size 291x19
+            text run at (51,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=22472"
+        RenderText {#text} at (342,0) size 4x19
+          text run at (342,0) width 4: " "
+        RenderInline {I} at (0,0) size 424x19
+          RenderText {#text} at (346,0) size 424x19
+            text run at (346,0) width 424: "Selection is not completely erased when a replaced element moves"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,36) size 784x237
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,52) size 214x232
+  RenderImage {IMG} at (0,0) size 214x232
+selection start: position 0 of child 3 {IMG} of child 1 {BODY} of child 1 {HTML} of document
+selection end:   position 1 of child 3 {IMG} of child 1 {BODY} of child 1 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1cb6504..a4fbe90 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -597,14 +597,10 @@ BUG21510 WIN LINUX : LayoutTests/fast/repaint/text-shadow.html = FAIL
 // Implement layoutTestController.display()
 BUG8630 WIN LINUX : LayoutTests/fast/repaint/body-background-image.html = FAIL
 BUG8630 WIN LINUX DEBUG SLOW : LayoutTests/fast/repaint/line-flow-with-floats-1.html = PASS
+// Relies on text metrics to pass. Rework to be meaningful for ports other than platform/mac.
 BUG8630 WIN LINUX : LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL
-BUG8630 WIN LINUX : LayoutTests/fast/repaint/selected-replaced.html = FAIL
-BUG8630 WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint-2.html = FAIL
-BUG8630 WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint.html = FAIL
 BUG8630 WIN LINUX : LayoutTests/fast/backgrounds/solid-color-context-restore.html = FAIL
 BUG8630 WIN LINUX : LayoutTests/fast/dynamic/containing-block-change.html = FAIL
-BUG8630 WIN LINUX : LayoutTests/fast/forms/hidden-listbox.html = IMAGE+TEXT
-BUG8630 WIN : LayoutTests/fast/forms/listbox-clip.html = IMAGE
 BUG8630 LINUX : LayoutTests/fast/forms/listbox-clip.html = IMAGE+TEXT
 BUG8630 WIN LINUX RELEASE : LayoutTests/fast/overflow/hidden-scrollbar-resize.html = FAIL
 BUG8630 LINUX WIN DEBUG : LayoutTests/fast/overflow/hidden-scrollbar-resize.html = FAIL
@@ -630,7 +626,6 @@ BUG21113 : LayoutTests/userscripts/script-run-at-end.html = FAIL
 // error in the header of the following test.
 BUG24197 SKIP : LayoutTests/fast/css/disabled-author-styles.html = FAIL
 
-
 // -----------------------------------------------------------------
 // Other
 // -----------------------------------------------------------------
@@ -880,6 +875,10 @@ BUG24199 : LayoutTests/http/tests/security/local-user-CSS-from-remote.html = FAI
 // Implement CSS -webkit-font-smoothing property support.
 BUG23270 WIN LINUX : LayoutTests/fast/css/font-smoothing.html = FAIL
 
+// Make canvas shadow work with drawImage.
+BUG11153 WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint-2.html = FAIL
+BUG11153 WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint.html = FAIL
+
 // Extra space at end of test results.  Since this is a crash test, a
 // FAIL here is just as good as running the test normally.
 // FAIL results from an extra newline at the top of the results