Diff
Modified: trunk/LayoutTests/ChangeLog (86988 => 86989)
--- trunk/LayoutTests/ChangeLog 2011-05-20 22:26:37 UTC (rev 86988)
+++ trunk/LayoutTests/ChangeLog 2011-05-20 22:29:52 UTC (rev 86989)
@@ -1,3 +1,12 @@
+2011-05-20 Ryosuke Niwa <[email protected]>
+
+ Rebaselines after r86983.
+
+ * platform/chromium-win/editing/pasteboard/smart-paste-003-expected.txt:
+ * platform/chromium-win/editing/pasteboard/smart-paste-004-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-xml-expected.txt:
+ * platform/win/editing/pasteboard/paste-xml-expected.txt:
+
2011-05-20 Justin Schuh <[email protected]>
Unreviewed.
Modified: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/smart-paste-003-expected.txt (86988 => 86989)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/smart-paste-003-expected.txt 2011-05-20 22:26:37 UTC (rev 86988)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/smart-paste-003-expected.txt 2011-05-20 22:29:52 UTC (rev 86989)
@@ -8,7 +8,7 @@
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of #text > SPAN > DIV > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -38,12 +38,9 @@
RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)]
RenderText {#text} at (2,2) size 40x27
text run at (2,2) width 40: "test "
- RenderText {#text} at (42,2) size 34x27
- text run at (42,2) width 34: "test"
- RenderInline {SPAN} at (0,0) size 12x27
- RenderText {#text} at (76,2) size 12x27
- text run at (76,2) width 12: " "
+ RenderText {#text} at (42,2) size 46x27
+ text run at (42,2) width 46: "test "
RenderText {#text} at (88,2) size 34x27
text run at (88,2) width 34: "test"
RenderBlock (anonymous) at (0,32) size 784x0
-caret: position 2 of child 0 {#text} of child 2 {SPAN} of child 1 {DIV} of child 3 {DIV} of body
+caret: position 6 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/smart-paste-004-expected.txt (86988 => 86989)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/smart-paste-004-expected.txt 2011-05-20 22:26:37 UTC (rev 86988)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/smart-paste-004-expected.txt 2011-05-20 22:29:52 UTC (rev 86989)
@@ -8,7 +8,7 @@
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of #text > SPAN > DIV > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 7 of #text > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -38,12 +38,9 @@
RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)]
RenderText {#text} at (2,2) size 47x27
text run at (2,2) width 47: "test t"
- RenderText {#text} at (49,2) size 40x27
- text run at (49,2) width 40: " test"
- RenderInline {SPAN} at (0,0) size 12x27
- RenderText {#text} at (89,2) size 12x27
- text run at (89,2) width 12: " "
+ RenderText {#text} at (49,2) size 52x27
+ text run at (49,2) width 52: " test "
RenderText {#text} at (101,2) size 27x27
text run at (101,2) width 27: "est"
RenderBlock (anonymous) at (0,32) size 784x0
-caret: position 2 of child 0 {#text} of child 2 {SPAN} of child 1 {DIV} of child 3 {DIV} of body
+caret: position 7 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt (86988 => 86989)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt 2011-05-20 22:26:37 UTC (rev 86988)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt 2011-05-20 22:29:52 UTC (rev 86989)
@@ -12,7 +12,7 @@
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > span > div > body > html > #document to 7 of #text > span > div > body > html > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > span > div > body > html > #document to 1 of #text > span > div > body > html > #document toDOMRange:range from 3 of #text > div > body > html > #document to 3 of #text > div > body > html > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > span > div > body > html > #document to 1 of #text > span > div > body > html > #document toDOMRange:range from 3 of #text > span > div > body > html > #document to 3 of #text > span > div > body > html > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -21,13 +21,12 @@
RenderBlock {html} at (0,0) size 800x72
RenderBody {body} at (8,8) size 784x56
RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderInline {span} at (0,0) size 69x28
+ RenderInline {span} at (0,0) size 140x28
RenderText {#text} at (14,14) size 69x28
text run at (14,14) width 69: "foo bar"
- RenderText {#text} at (83,14) size 31x28
- text run at (83,14) width 31: "bar"
- RenderInline {span} at (0,0) size 40x28
+ RenderText {#text} at (83,14) size 31x28
+ text run at (83,14) width 31: "bar"
RenderText {#text} at (114,14) size 40x28
text run at (114,14) width 40: " baz"
RenderText {#text} at (0,0) size 0x0
-caret: position 3 of child 2 {#text} of child 1 {div} of body
+caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
Modified: trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt (86988 => 86989)
--- trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt 2011-05-20 22:26:37 UTC (rev 86988)
+++ trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt 2011-05-20 22:29:52 UTC (rev 86989)
@@ -4,13 +4,12 @@
RenderBlock {html} at (0,0) size 800x72
RenderBody {body} at (8,8) size 784x56
RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderInline {span} at (0,0) size 69x28
+ RenderInline {span} at (0,0) size 140x28
RenderText {#text} at (14,14) size 69x28
text run at (14,14) width 69: "foo bar"
- RenderText {#text} at (83,14) size 31x28
- text run at (83,14) width 31: "bar"
- RenderInline {span} at (0,0) size 40x28
+ RenderText {#text} at (83,14) size 31x28
+ text run at (83,14) width 31: "bar"
RenderText {#text} at (114,14) size 40x28
text run at (114,14) width 40: " baz"
RenderText {#text} at (0,0) size 0x0
-caret: position 3 of child 2 {#text} of child 1 {div} of body
+caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
