Rebaseline some layout-tests which changed in upstream webkit r46412.

BUG=http://crbug.com/17326

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

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

10 files changed, 44 insertions, 48 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.checksum
index 750386d..d732d2f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.checksum
@@ -1 +1 @@
-974428c1835382feb1e82ffb95f14d6d
\ No newline at end of file
+c4bda2a247f4ef3fff671db5d2e7b02a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.png
index b448647..fdb19c7 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/indent-selection-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt
index 1f15d8b..0190d86 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4641880-2-expected.txt
@@ -3,7 +3,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document to 34 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document to 35 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -24,5 +24,5 @@ layer at (0,0) size 800x600
           RenderText {#text} at (0,0) size 234x19
             text run at (0,0) width 234: "This paragraph should not be indented."
           RenderBR {BR} at (234,15) size 0x0
-selection start: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 34 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 35 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt
index a5c29bb..489acef 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/4916541-expected.txt
@@ -10,11 +10,13 @@ layer at (0,0) size 800x600
           text run at (0,20) width 279: "and 'bar' before and after the indent operation."
       RenderBlock {DIV} at (0,56) size 784x40
         RenderBlock {BLOCKQUOTE} at (40,0) size 744x40
-          RenderText {#text} at (0,0) size 20x19
-            text run at (0,0) width 20: "foo"
+          RenderInline {SPAN} at (0,0) size 20x19
+            RenderText {#text} at (0,0) size 20x19
+              text run at (0,0) width 20: "foo"
           RenderBR {BR} at (20,15) size 0x0
-          RenderText {#text} at (0,20) size 20x19
-            text run at (0,20) width 20: "bar"
+          RenderInline {SPAN} at (0,0) size 20x19
+            RenderText {#text} at (0,20) size 20x19
+              text run at (0,20) width 20: "bar"
         RenderBlock (anonymous) at (0,40) size 784x0
-selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 2 of child 2 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection start: position 1 of child 0 {#text} of child 0 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 2 of child 0 {#text} of child 2 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt
index 0e62a3d..abf571d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.txt
@@ -10,10 +10,12 @@ layer at (0,0) size 800x600
           text run at (0,20) width 725: "implement a \"Quote Text\" feature, and style rules for blockquotes appeared on the blockquotes that we use to implement"
           text run at (0,40) width 57: "indenting."
       RenderBlock {DIV} at (0,76) size 784x66
-        RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
-          RenderText {#text} at (0,0) size 219x19
-            text run at (0,0) width 219: "This should be indented, not quoted."
+        RenderBlock {DIV} at (0,0) size 784x20
+          RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
+            RenderText {#text} at (0,0) size 219x19
+              text run at (0,0) width 219: "This should be indented, not quoted."
+          RenderBlock (anonymous) at (0,20) size 784x0
         RenderBlock {BLOCKQUOTE} at (8,28) size 768x38 [border: (1px dashed #AAAAAA)]
           RenderText {#text} at (9,9) size 167x19
             text run at (9,9) width 167: "This text should be Quoted."
-caret: position 0 of child 0 {#text} of child 1 {BLOCKQUOTE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt
index aec3345..20b6374 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5481523-expected.txt
@@ -26,7 +26,5 @@ layer at (0,0) size 800x600
                   RenderTableCell {TD} at (43,28) size 33x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
                     RenderText {#text} at (2,2) size 29x19
                       text run at (2,2) width 29: "Four"
-            RenderBlock (anonymous) at (0,56) size 704x0
-        RenderBlock (anonymous) at (0,56) size 784x0
 selection start: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 1 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 2 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum
index 42f5b97..ca5bd00 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.checksum
@@ -1 +1 @@
-d9ee9ea23a699c3b512e3946a5812bdc
\ No newline at end of file
+8afb4eda7a2857d5063cbd3bed8ab6f0
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png
index a1133d7..9b414ea 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt
index 87c0887..c08f2fc 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-selection-expected.txt
@@ -3,7 +3,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document to 5 of #text > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > BLOCKQUOTE > DIV > BODY > HTML > #document to 5 of #text > SPAN > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -17,42 +17,43 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,20) size 784x20
         RenderBR {BR} at (0,0) size 0x19
       RenderBlock {DIV} at (0,40) size 784x212
-        RenderBlock {BLOCKQUOTE} at (40,0) size 744x60
+        RenderBlock {BLOCKQUOTE} at (40,0) size 744x212
           RenderBlock (anonymous) at (0,0) size 744x40
-            RenderText {#text} at (0,0) size 40x19
-              text run at (0,0) width 40: "Lorem"
+            RenderInline {SPAN} at (0,0) size 40x19
+              RenderText {#text} at (0,0) size 40x19
+                text run at (0,0) width 40: "Lorem"
             RenderBR {BR} at (40,15) size 0x0
             RenderText {#text} at (0,20) size 80x19
               text run at (0,20) width 80: "more Lorem!"
-          RenderBlock {BLOCKQUOTE} at (40,40) size 704x20
-            RenderText {#text} at (0,0) size 35x19
-              text run at (0,0) width 35: "ipsum"
-        RenderBlock (anonymous) at (0,60) size 784x0
-        RenderBlock {BLOCKQUOTE} at (40,76) size 744x60
-          RenderBlock {UL} at (0,0) size 744x60
-            RenderBlock {UL} at (40,0) size 704x60
+          RenderBlock {BLOCKQUOTE} at (40,40) size 704x132
+            RenderBlock (anonymous) at (0,0) size 704x20
+              RenderText {#text} at (0,0) size 35x19
+                text run at (0,0) width 35: "ipsum"
+              RenderBR {BR} at (35,15) size 0x0
+            RenderBlock {UL} at (0,36) size 704x60
               RenderListItem {LI} at (40,0) size 664x20
-                RenderListMarker at (-18,0) size 7x19: white bullet
+                RenderListMarker at (-18,0) size 7x19: bullet
                 RenderText {#text} at (0,0) size 25x19
                   text run at (0,0) width 25: "Foo"
               RenderListItem {LI} at (40,20) size 664x20
-                RenderListMarker at (-18,0) size 7x19: white bullet
+                RenderListMarker at (-18,0) size 7x19: bullet
                 RenderText {#text} at (0,0) size 22x19
                   text run at (0,0) width 22: "Bar"
               RenderListItem {LI} at (40,40) size 664x20
-                RenderListMarker at (-18,0) size 7x19: white bullet
+                RenderListMarker at (-18,0) size 7x19: bullet
                 RenderText {#text} at (0,0) size 23x19
                   text run at (0,0) width 23: "Baz"
-        RenderBlock {BLOCKQUOTE} at (40,152) size 744x60
-          RenderBlock {BLOCKQUOTE} at (40,0) size 704x20
-            RenderText {#text} at (0,0) size 35x19
-              text run at (0,0) width 35: "Dolor"
-          RenderBlock (anonymous) at (0,20) size 744x40
+            RenderBlock (anonymous) at (0,112) size 704x20
+              RenderText {#text} at (0,0) size 35x19
+                text run at (0,0) width 35: "Dolor"
+          RenderBlock (anonymous) at (0,172) size 744x40
             RenderText {#text} at (0,0) size 32x19
               text run at (0,0) width 32: "Sum!"
             RenderBR {BR} at (32,15) size 0x0
-            RenderText {#text} at (0,20) size 33x19
-              text run at (0,20) width 33: "Thing"
+            RenderInline {SPAN} at (0,0) size 33x19
+              RenderText {#text} at (0,20) size 33x19
+                text run at (0,20) width 33: "Thing"
         RenderBlock (anonymous) at (0,212) size 784x0
-selection start: position 0 of child 0 {#text} of child 1 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 5 of child 3 {#text} of child 3 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+          RenderText {#text} at (0,0) size 0x0
+selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 5 of child 0 {#text} of child 6 {SPAN} of child 1 {BLOCKQUOTE} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 800cb62..1ca9ccd 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2978,13 +2978,6 @@ BUG13907 WIN : LayoutTests/media/audio-constructor-autobuffer.html = FAIL
 BUG17321 LINUX WIN : LayoutTests/fast/loader/non-html-load-event.html = FAIL
 BUG17321 MAC : LayoutTests/fast/loader/non-html-load-event.html = CRASH FAIL
 
-// Tests that regressed from WebKit merge (got rebaselined upstream)
-BUG17326 : LayoutTests/editing/execCommand/4641880-2.html = FAIL
-BUG17326 : LayoutTests/editing/execCommand/4916541.html = FAIL
-BUG17326 : LayoutTests/editing/execCommand/5138441.html = FAIL
-BUG17326 : LayoutTests/editing/execCommand/5481523.html = FAIL
-BUG17326 : LayoutTests/editing/execCommand/indent-selection.html = FAIL
-
 BUG17332 WIN : LayoutTests/editing/execCommand/19087.html = CRASH
 BUG17332 WIN : LayoutTests/editing/execCommand/19653-1.html = CRASH FAIL