Rebaseline LayoutTests/editing/selection/5136696.html.

BUG=10476
TEST=none
Review URL: http://codereview.chromium.org/165231

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

7 files changed, 35 insertions, 6 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.checksum
index 24dc163..eac98d9 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.checksum
@@ -1 +1 @@
-8b7c3a64dc00cd1d27dc03b5466a2bf1
\ No newline at end of file
+b710db2add099a7e6fd58f1e936b5021
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.png
index 6325915..c7cc1fe 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.txt
new file mode 100644
index 0000000..029fdab
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5136696-expected.txt
@@ -0,0 +1,30 @@
+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 784x20
+        RenderText {#text} at (0,0) size 632x19
+          text run at (0,0) width 632: "This tests to make sure that a selection in one from isn't cleared when focusing a node in a different frame."
+      RenderBlock (anonymous) at (0,36) size 784x180
+        RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
+          layer at (0,0) size 300x150
+            RenderView at (0,0) size 300x150
+          layer at (0,0) size 300x150
+            RenderBlock {HTML} at (0,0) size 300x150
+              RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
+                RenderText {#text} at (0,0) size 258x39
+                  text run at (0,0) width 254: "This test should be selected, but this frame"
+                  text run at (254,0) width 4: " "
+                  text run at (0,20) width 127: "shouldn't be focused."
+                RenderText {#text} at (0,0) size 0x0
+        RenderBR {BR} at (304,154) size 0x0
+        RenderTextControl {INPUT} at (2,156) size 215x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (12,203) size 211x16
+  RenderBlock {DIV} at (2,3) size 211x16
+    RenderText {#text} at (1,0) size 190x16
+      text run at (1,0) width 190: "This text field should be focused."
+selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 34 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.checksum
index b8210ad..2476323 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.checksum
@@ -1 +1 @@
-3cc26e61ac5428d499bae9ebebec35a5
\ No newline at end of file
+1547d129aa42d69fa3ff335a27a48876
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.png
index 2837243..b1c17f9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt
index c5fcaa4..029fdab 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5136696-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 632x19
           text run at (0,0) width 632: "This tests to make sure that a selection in one from isn't cleared when focusing a node in a different frame."
-      RenderBlock (anonymous) at (0,36) size 784x176
+      RenderBlock (anonymous) at (0,36) size 784x180
         RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
           layer at (0,0) size 300x150
             RenderView at (0,0) size 300x150
@@ -19,10 +19,10 @@ layer at (0,0) size 800x600
                   text run at (0,20) width 127: "shouldn't be focused."
                 RenderText {#text} at (0,0) size 0x0
         RenderBR {BR} at (304,154) size 0x0
-        RenderTextControl {INPUT} at (0,154) size 215x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderTextControl {INPUT} at (2,156) size 215x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-layer at (10,201) size 211x16
+layer at (12,203) size 211x16
   RenderBlock {DIV} at (2,3) size 211x16
     RenderText {#text} at (1,0) size 190x16
       text run at (1,0) width 190: "This text field should be focused."
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7363a24..e63681f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2016,7 +2016,6 @@ BUG10475 WIN LINUX : LayoutTests/fast/forms/range-thumb-height-percentage.html =
 
 SKIP BUG9613 : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = PASS
 
-BUG10476 WIN LINUX : LayoutTests/editing/selection/5136696.html = FAIL PASS
 BUG10476 : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post.html = FAIL PASS
 
 // Merge WebKit 42133:42199 regressions