Fix 2 layout tests under editing\selection.

These tests test the Mac behavior of selecting words on
right-click. We don't do this on Windows so the caret
should be set instead of a selection being formed.

Interestingly, one test changed upstream to not
select on right-click so we match that except for
font metrics.

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

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

5 files changed, 16 insertions, 15 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt
index 6f48cee..7ec09c0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5109817-expected.txt
@@ -14,3 +14,4 @@ layer at (0,0) size 800x600
             text run at (27,0) width 43: "second"
         RenderText {#text} at (70,0) size 249x19
           text run at (70,0) width 249: " word in this sentence should be selected."
+caret: position 3 of child 0 {#text} of child 1 {SPAN} 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/5354455-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.checksum
index 8febd68..9ecf9e0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.checksum
@@ -1 +1 @@
-64084c45e75947232abe1ef4cd667c6b
\ No newline at end of file
+71d04d5223d36b94a5de3fd39dcdda14
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.png
index 4befa55..7b43637 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.txt
index 2d63c46..2d429d9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5354455-2-expected.txt
@@ -2,23 +2,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
-layer at (8,8) size 612x150
-  RenderBody {BODY} at (8,8) size 612x150 [border: (1px solid #000000)]
+layer at (8,8) size 612x130
+  RenderBody {BODY} at (8,8) size 612x130 [border: (1px solid #000000)]
     RenderBlock {H1} at (6,6) size 600x37
       RenderText {#text} at (0,0) size 450x36
         text run at (0,0) width 450: "Word selection on right click test"
-    RenderBlock (anonymous) at (6,64) size 600x80
+    RenderBlock (anonymous) at (6,64) size 600x60
       RenderText {#text} at (0,0) size 570x39
         text run at (0,0) width 570: "This tests to make sure that right clicking non-editable content only creates a word selection for"
-        text run at (0,20) width 126: "clicks over text. The "
-      RenderInline {SPAN} at (0,0) size 43x19
-        RenderText {#text} at (126,20) size 43x19
-          text run at (126,20) width 43: "second"
-      RenderText {#text} at (169,20) size 587x59
-        text run at (169,20) width 353: " word in this sentence should be selected when run through"
-        text run at (0,40) width 524: "DumpRenderTree. To run manually, right click on text, and a word should be selected. "
-        text run at (524,40) width 63: "Right click"
-        text run at (0,60) width 572: "on the empty space outside and to the right of the black border, no selection should be created."
+        text run at (0,20) width 99: "clicks over text. "
+      RenderInline {SPAN} at (0,0) size 17x19
+        RenderText {#text} at (99,20) size 17x19
+          text run at (99,20) width 17: "To"
+      RenderText {#text} at (116,20) size 588x39
+        text run at (116,20) width 390: " run manually, right click on text, and a word should be selected. "
+        text run at (506,20) width 82: "Right click on"
+        text run at (0,40) width 564: "the empty space outside and to the right of the black border, the selection should be removed."
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
+caret: position 0 of child 0 {#text} of child 1 {H1} of child 1 {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 4909686..e90b7d8 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -2059,8 +2059,8 @@ LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_layers-show.h
 // Merge 41709:41733
 // Expectations changed upstream.
 WIN : pending/security/block-test.html = FAIL
-WIN LINUX : LayoutTests/editing/selection/5354455-2.html = FAIL
-WIN LINUX : LayoutTests/editing/selection/5109817.html = FAIL
+LINUX : LayoutTests/editing/selection/5354455-2.html = FAIL
+LINUX : LayoutTests/editing/selection/5109817.html = FAIL
 WIN LINUX : LayoutTests/http/tests/misc/url-in-utf16le.html = FAIL
 MAC RELEASE : LayoutTests/http/tests/misc/url-in-utf16le.html = FAIL
 WIN LINUX : LayoutTests/http/tests/misc/url-in-utf16be.html = TIMEOUT