Fix my first layout test! The expected and actual results were two different representations of the same visual position. Specifically, the expected results were looking for the deep position, but the actual results were a shallow position. This is from a webkit change (http://trac.webkit.org/changeset/39831) where appendTrailingWhitespace was changed to stop modifying the live selection to use the deepEquivalent of the end position, thus leaving it in the shallow position.

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

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

2 files changed, 30 insertions, 32 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt
index 3658a7e..a92aca9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt
@@ -1,30 +1,30 @@
-ALERT: 33

-ALERT: 116.5

-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 784x80

-        RenderText {#text} at (0,0) size 771x79

-          text run at (0,0) width 477: "This tests double clicking after the last character in the last cell of a block table. "

-          text run at (477,0) width 294: "The paragraph break (the space between the last"

-          text run at (0,20) width 448: "character and the first character in the next paragraph) should be selected. "

-          text run at (448,20) width 272: "Selection painting problems might prevent the"

-          text run at (0,40) width 373: "paragraph break from appearing as selected even though it is. "

-          text run at (373,40) width 377: "To test manually, double click inside the table cell, after the last"

-          text run at (0,60) width 152: "character, and hit delete. "

-          text run at (152,60) width 265: "Afterward, the table should contain 'foobar'."

-      RenderBlock {DIV} at (0,96) size 784x50

-        RenderTable {TABLE} at (0,0) size 110x30 [border: (1px outset #808080)]

-          RenderTableSection {TBODY} at (1,1) size 108x28

-            RenderTableRow {TR} at (0,2) size 108x24

-              RenderTableCell {TD} at (2,2) size 104x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]

-                RenderInline {SPAN} at (0,0) size 20x19

-                  RenderText {#text} at (2,2) size 20x19

-                    text run at (2,2) width 20: "foo"

-        RenderBlock {DIV} at (0,30) size 784x20

-          RenderText {#text} at (0,0) size 20x19

-            text run at (0,0) width 20: "bar"

-selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document

-selection end:   position 0 of child 0 {#text} of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document

+ALERT: 33
+ALERT: 116.5
+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 784x80
+        RenderText {#text} at (0,0) size 771x79
+          text run at (0,0) width 477: "This tests double clicking after the last character in the last cell of a block table. "
+          text run at (477,0) width 294: "The paragraph break (the space between the last"
+          text run at (0,20) width 448: "character and the first character in the next paragraph) should be selected. "
+          text run at (448,20) width 272: "Selection painting problems might prevent the"
+          text run at (0,40) width 373: "paragraph break from appearing as selected even though it is. "
+          text run at (373,40) width 377: "To test manually, double click inside the table cell, after the last"
+          text run at (0,60) width 152: "character, and hit delete. "
+          text run at (152,60) width 265: "Afterward, the table should contain 'foobar'."
+      RenderBlock {DIV} at (0,96) size 784x50
+        RenderTable {TABLE} at (0,0) size 110x30 [border: (1px outset #808080)]
+          RenderTableSection {TBODY} at (1,1) size 108x28
+            RenderTableRow {TR} at (0,2) size 108x24
+              RenderTableCell {TD} at (2,2) size 104x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                RenderInline {SPAN} at (0,0) size 20x19
+                  RenderText {#text} at (2,2) size 20x19
+                    text run at (2,2) width 20: "foo"
+        RenderBlock {DIV} at (0,30) size 784x20
+          RenderText {#text} at (0,0) size 20x19
+            text run at (0,0) width 20: "bar"
+selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+selection end:   position 0 of child 3 {DIV} 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 bb665da..ddc4299 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1447,8 +1447,6 @@ LINUX : LayoutTests/svg/custom/stroke-fallback.svg = FAIL
 // New test. We should fix it, but it doesn't need to block the current release
 DEFER : LayoutTests/plugins/npruntime.html = FAIL TIMEOUT
 
-// Merge 39830:39880 - regressions
-WIN : LayoutTests/editing/selection/5057506.html = FAIL
 // Expectations for this test changed upstream. We should fix this test, but
 // it doesn't need to block the current release
 DEFER LINUX WIN : LayoutTests/fast/events/init-events.html = FAIL