Rebaseline two tests.

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

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

7 files changed, 37 insertions, 2 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.checksum
new file mode 100755
index 0000000..0df91e6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.checksum
@@ -0,0 +1 @@
+37aab07bcc96e7db956491aa2b98c0b0
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.png
new file mode 100755
index 0000000..b581059
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt
new file mode 100755
index 0000000..68b28d17
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-1-expected.txt
@@ -0,0 +1,16 @@
+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 (anonymous) at (0,0) size 784x20

+        RenderInline {SPAN} at (0,0) size 354x19

+          RenderText {#text} at (0,0) size 354x19

+            text run at (0,0) width 354: "This test passes if the caret is at the start of the second line."

+        RenderText {#text} at (0,0) size 0x0

+      RenderBlock {DIV} at (0,20) size 352x102 [border: (1px solid #0000FF)]

+        RenderText {#text} at (1,1) size 11x19

+          text run at (1,1) width 11: "a "

+        RenderText {#text} at (12,1) size 301x19

+          text run at (12,1) width 301: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

+caret: position 2 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.checksum
new file mode 100755
index 0000000..581ddc9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.checksum
@@ -0,0 +1 @@
+7b7e1e3725f6850a18dd73ed5d8ed7f8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.png
new file mode 100755
index 0000000..6a48d26
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt
new file mode 100755
index 0000000..a17594b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/wrapped-line-caret-2-expected.txt
@@ -0,0 +1,17 @@
+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 (anonymous) at (0,0) size 784x20

+        RenderInline {SPAN} at (0,0) size 354x19

+          RenderText {#text} at (0,0) size 354x19

+            text run at (0,0) width 354: "This test passes if the caret is at the start of the second line."

+        RenderText {#text} at (0,0) size 0x0

+      RenderBlock {DIV} at (0,20) size 352x102 [border: (1px solid #0000FF)]

+        RenderText {#text} at (1,1) size 11x19

+          text run at (1,1) width 11: "a "

+        RenderInline {SPAN} at (0,0) size 301x19 [color=#0000FF]

+          RenderText {#text} at (12,1) size 301x19

+            text run at (12,1) width 301: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

+caret: position 2 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 85e666d..b339ab2 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1685,9 +1685,9 @@ LayoutTests/fast/events/dispatchEvent-crash.html = FAIL
 // WebKit Merge 38850:38900 new tests
 
 // Linux pixeltest failure: There should be two lines of text
-LINUX WIN : LayoutTests/editing/selection/wrapped-line-caret-1.html = FAIL
+LINUX : LayoutTests/editing/selection/wrapped-line-caret-1.html = FAIL
 // Linux pixeltest failure: There should be two lines of text
-LINUX WIN : LayoutTests/editing/selection/wrapped-line-caret-2.html = FAIL
+LINUX : LayoutTests/editing/selection/wrapped-line-caret-2.html = FAIL
 LayoutTests/fast/dom/dom-constructors.html = FAIL
 
 // WebKit Merge 39050:39100 failures: