Diff
Modified: trunk/LayoutTests/ChangeLog (130439 => 130440)
--- trunk/LayoutTests/ChangeLog 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/ChangeLog 2012-10-05 00:46:01 UTC (rev 130440)
@@ -1,5 +1,16 @@
2012-10-04 Ryosuke Niwa <[email protected]>
+ More Qt rebaselines after r130411.
+
+ * platform/qt/editing/deleting/delete-block-merge-contents-020-expected.txt:
+ * platform/qt/editing/deleting/delete-block-merge-contents-021-expected.txt:
+ * platform/qt/editing/pasteboard/5006779-expected.txt:
+ * platform/qt/editing/pasteboard/paste-line-endings-007-expected.txt:
+ * platform/qt/editing/pasteboard/paste-line-endings-008-expected.txt:
+ * platform/qt/editing/pasteboard/smart-paste-004-expected.txt: Removed.
+
+2012-10-04 Ryosuke Niwa <[email protected]>
+
GTK+ rebaselines after r130411.
* platform/gtk/editing/deleting/delete-block-merge-contents-018-expected.txt:
Modified: trunk/LayoutTests/platform/qt/editing/deleting/delete-block-merge-contents-020-expected.txt (130439 => 130440)
--- trunk/LayoutTests/platform/qt/editing/deleting/delete-block-merge-contents-020-expected.txt 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/platform/qt/editing/deleting/delete-block-merge-contents-020-expected.txt 2012-10-05 00:46:01 UTC (rev 130440)
@@ -8,7 +8,7 @@
EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 0 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 2 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 2 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
@@ -21,9 +21,7 @@
text run at (14,14) width 350: "Should see \"XX\" in a single red box."
RenderBlock {DIV} at (0,80) size 784x56
RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 17x28
- text run at (14,14) width 17: "X"
- RenderText {#text} at (31,14) size 17x28
- text run at (31,14) width 17: "X"
+ RenderText {#text} at (14,14) size 34x28
+ text run at (14,14) width 34: "XX"
RenderText {#text} at (0,0) size 0x0
caret: position 2 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/qt/editing/deleting/delete-block-merge-contents-021-expected.txt (130439 => 130440)
--- trunk/LayoutTests/platform/qt/editing/deleting/delete-block-merge-contents-021-expected.txt 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/platform/qt/editing/deleting/delete-block-merge-contents-021-expected.txt 2012-10-05 00:46:01 UTC (rev 130440)
@@ -8,7 +8,7 @@
EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 2 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 2 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
@@ -24,10 +24,8 @@
RenderBlock {DIV} at (0,108) size 784x112
RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x28
- RenderText {#text} at (0,0) size 17x28
- text run at (0,0) width 17: "X"
- RenderText {#text} at (17,0) size 17x28
- text run at (17,0) width 17: "X"
+ RenderText {#text} at (0,0) size 34x28
+ text run at (0,0) width 34: "XX"
RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 34x28
text run at (14,14) width 34: "XX"
Modified: trunk/LayoutTests/platform/qt/editing/pasteboard/5006779-expected.txt (130439 => 130440)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/5006779-expected.txt 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/5006779-expected.txt 2012-10-05 00:46:01 UTC (rev 130440)
@@ -21,4 +21,4 @@
RenderBlock {BLOCKQUOTE} at (0,76) size 784x19 [color=#0000FF] [border: none (2px solid #0000FF)]
RenderText {#text} at (12,0) size 79x19
text run at (12,0) width 79: "Hello World."
-caret: position 2 of child 0 {#text} of child 2 {DIV} of body
+caret: position 3 of child 0 {#text} of child 2 {DIV} of body
Modified: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-line-endings-007-expected.txt (130439 => 130440)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-line-endings-007-expected.txt 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-line-endings-007-expected.txt 2012-10-05 00:46:01 UTC (rev 130440)
@@ -13,7 +13,7 @@
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 9 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -49,8 +49,6 @@
text run at (0,0) width 76: "line one"
RenderBR {BR} at (76,22) size 0x0
RenderBlock {DIV} at (2,30) size 780x28
- RenderText {#text} at (0,0) size 6x28
- text run at (0,0) width 6: "l"
- RenderText {#text} at (6,0) size 71x28
- text run at (6,0) width 71: "ine two"
+ RenderText {#text} at (0,0) size 77x28
+ text run at (0,0) width 77: "line two"
caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-line-endings-008-expected.txt (130439 => 130440)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-line-endings-008-expected.txt 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-line-endings-008-expected.txt 2012-10-05 00:46:01 UTC (rev 130440)
@@ -13,7 +13,7 @@
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > DIV > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > DIV > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > DIV > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
@@ -49,8 +49,6 @@
text run at (0,0) width 76: "line one"
RenderBlock (anonymous) at (2,30) size 780x0
RenderBlock {DIV} at (2,30) size 780x28
- RenderText {#text} at (0,0) size 6x28
- text run at (0,0) width 6: "l"
- RenderText {#text} at (6,0) size 71x28
- text run at (6,0) width 71: "ine two"
+ RenderText {#text} at (0,0) size 77x28
+ text run at (0,0) width 77: "line two"
caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/smart-paste-004-expected.txt (130439 => 130440)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/smart-paste-004-expected.txt 2012-10-05 00:43:04 UTC (rev 130439)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/smart-paste-004-expected.txt 2012-10-05 00:46:01 UTC (rev 130440)
@@ -1,18 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 10 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 10 of #text > DIV > DIV > BODY > HTML > #document to 10 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 10 of #text > DIV > DIV > BODY > HTML > #document to 10 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 9 of #text > DIV > DIV > BODY > HTML > #document to 9 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-Tests:
-Smart paste when pasting after word and a space before another word.
-Expected Results:
-A space should be added after the pasted word before the other preexisting word. It should like this:
-test test test
-test testtest test
-execCopyCommand: <div id="test" class="editing"> test test </div>
-execPasteCommand: <div id="test" class="editing"> test testtest test</div>
