2011-05-12 Chang Shu <cshu@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Rebaseline editing/pasteboard tests that are working
        https://bugs.webkit.org/show_bug.cgi?id=60707

        * platform/qt/Skipped:
        * platform/qt/editing/pasteboard/4076267-2-expected.png: Added.
        * platform/qt/editing/pasteboard/4076267-2-expected.txt: Added.
        * platform/qt/editing/pasteboard/4076267-expected.png: Added.
        * platform/qt/editing/pasteboard/4076267-expected.txt: Added.
        * platform/qt/editing/pasteboard/4806874-expected.png: Added.
        * platform/qt/editing/pasteboard/4806874-expected.txt:
        * platform/qt/editing/pasteboard/5387578-expected.png: Added.
        * platform/qt/editing/pasteboard/5387578-expected.txt:
        * platform/qt/editing/pasteboard/bad-placeholder-expected.png: Added.
        * platform/qt/editing/pasteboard/bad-placeholder-expected.txt:
        * platform/qt/editing/pasteboard/block-wrappers-necessary-expected.png: Added.
        * platform/qt/editing/pasteboard/block-wrappers-necessary-expected.txt:
        * platform/qt/editing/pasteboard/input-field-1-expected.png: Added.
        * platform/qt/editing/pasteboard/input-field-1-expected.txt:
        * platform/qt/editing/pasteboard/nested-blocks-with-text-area-expected.png: Added.
        * platform/qt/editing/pasteboard/nested-blocks-with-text-area-expected.txt:
        * platform/qt/editing/pasteboard/nested-blocks-with-text-field-expected.png: Added.
        * platform/qt/editing/pasteboard/nested-blocks-with-text-field-expected.txt:
        * platform/qt/editing/pasteboard/paste-text-008-expected.png: Added.
        * platform/qt/editing/pasteboard/paste-text-008-expected.txt: Added.
        * platform/qt/editing/pasteboard/smart-paste-008-expected.png: Added.
        * platform/qt/editing/pasteboard/smart-paste-008-expected.txt: Added.

Canonical link: https://commits.webkit.org/76031@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,34 @@
+2011-05-12  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Rebaseline editing/pasteboard tests that are working
+        https://bugs.webkit.org/show_bug.cgi?id=60707
+
+        * platform/qt/Skipped:
+        * platform/qt/editing/pasteboard/4076267-2-expected.png: Added.
+        * platform/qt/editing/pasteboard/4076267-2-expected.txt: Added.
+        * platform/qt/editing/pasteboard/4076267-expected.png: Added.
+        * platform/qt/editing/pasteboard/4076267-expected.txt: Added.
+        * platform/qt/editing/pasteboard/4806874-expected.png: Added.
+        * platform/qt/editing/pasteboard/4806874-expected.txt:
+        * platform/qt/editing/pasteboard/5387578-expected.png: Added.
+        * platform/qt/editing/pasteboard/5387578-expected.txt:
+        * platform/qt/editing/pasteboard/bad-placeholder-expected.png: Added.
+        * platform/qt/editing/pasteboard/bad-placeholder-expected.txt:
+        * platform/qt/editing/pasteboard/block-wrappers-necessary-expected.png: Added.
+        * platform/qt/editing/pasteboard/block-wrappers-necessary-expected.txt:
+        * platform/qt/editing/pasteboard/input-field-1-expected.png: Added.
+        * platform/qt/editing/pasteboard/input-field-1-expected.txt:
+        * platform/qt/editing/pasteboard/nested-blocks-with-text-area-expected.png: Added.
+        * platform/qt/editing/pasteboard/nested-blocks-with-text-area-expected.txt:
+        * platform/qt/editing/pasteboard/nested-blocks-with-text-field-expected.png: Added.
+        * platform/qt/editing/pasteboard/nested-blocks-with-text-field-expected.txt:
+        * platform/qt/editing/pasteboard/paste-text-008-expected.png: Added.
+        * platform/qt/editing/pasteboard/paste-text-008-expected.txt: Added.
+        * platform/qt/editing/pasteboard/smart-paste-008-expected.png: Added.
+        * platform/qt/editing/pasteboard/smart-paste-008-expected.txt: Added.
+
 2011-05-12  Andrew Wilson  <atwilson@chromium.org>
 
         Unreviewed expectations update for Chromium.

LayoutTests/platform/qt/Skipped

@@ -336,26 +336,11 @@ http/tests/xmlhttprequest/basic-auth-nouser.html
 # =========================================================================== #
 #       Failing pasteboard tests.                                             #
 # =========================================================================== #
-#------ Not selecting all of text.
-#------ sel.modify("move", "forward", "word"); does not select the last character in the word
-editing/pasteboard/smart-paste-008.html
 #------ safe to skip. Qt results same as chromium's. Mac drops the 'b' in the final bar,
 #------ that looks like a bug.
 editing/pasteboard/interchange-newline-2.html
 # ----- Results appear correct but have suspicious rendertree differences.
 editing/pasteboard/pasting-tabs.html
-editing/pasteboard/nested-blocks-with-text-area.html
-editing/pasteboard/nested-blocks-with-text-field.html
-editing/pasteboard/input-field-1.html
-editing/pasteboard/4806874.html
-# ----- These are actually safe to unskip. x/y differences only.
-editing/pasteboard/5387578.html
-editing/pasteboard/bad-placeholder.html
-# ----- Rendertree results OK but differences in message from editing delegate.
-editing/pasteboard/4076267-2.html
-editing/pasteboard/4076267.html
-editing/pasteboard/block-wrappers-necessary.html
-editing/pasteboard/paste-text-008.html
 # ----- Rendertree results OK but differences in editing delegate message due to rendering.
 # ----- This looks safe to unskip.
 editing/pasteboard/paste-xml.xhtml

LayoutTests/platform/qt/editing/pasteboard/4076267-2-expected.txt

@@ -0,0 +1,30 @@
+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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > DIV > DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertText:there should be a single trailing space between the '.' and the last character in this sentence  replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 96 of #text > DIV > DIV > BODY > HTML > #document to 96 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
+  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 784x22
+        RenderText {#text} at (0,0) size 407x22
+          text run at (0,0) width 407: "This tests to see if trailing spaces are lost during a copy/paste"
+      RenderBlock {HR} at (0,38) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (0,48) size 784x30 [border: (2px solid #FFAAAA)]
+        RenderBlock {DIV} at (2,2) size 780x26 [border: (2px solid #AAAAFF)]
+          RenderText {#text} at (2,2) size 618x22
+            text run at (2,2) width 618: "there should be a single trailing space between the '.' and the last character in this sentence ."
+caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body

LayoutTests/platform/qt/editing/pasteboard/4076267-expected.txt

@@ -0,0 +1,34 @@
+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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 56 of #text > DIV > DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertText: this text should have a single leading space before it replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 55 of #text > DIV > DIV > BODY > HTML > #document to 55 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
+  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 784x22
+        RenderText {#text} at (0,0) size 407x22
+          text run at (0,0) width 407: "This tests to see if leading spaces are lost during a copy/paste"
+      RenderBlock {HR} at (0,38) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (0,48) size 784x22
+        RenderBlock {DIV} at (0,0) size 784x22
+          RenderText {#text} at (0,0) size 350x22
+            text run at (0,0) width 350: " this text should have a single leading space before it"
+caret: position 55 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body

LayoutTests/platform/qt/editing/pasteboard/4806874-expected.txt

@@ -3,16 +3,16 @@ layer 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 605x20
-          text run at (0,0) width 273: "This tests for an infinite loop on Paste. "
-          text run at (273,0) width 332: "You should see 'Hello: ' and then an input field."
-      RenderBlock {DIV} at (0,36) size 784x28
-        RenderText {#text} at (0,4) size 38x20
-          text run at (0,4) width 38: "Hello"
-        RenderTextControl {INPUT} at (40,2) size 175x24
-        RenderText {#text} at (217,4) size 4x20
-          text run at (217,4) width 4: ":"
-layer at (50,48) size 171x20
-  RenderBlock {DIV} at (2,2) size 171x20
+      RenderBlock {P} at (0,0) size 784x22
+        RenderText {#text} at (0,0) size 581x22
+          text run at (0,0) width 261: "This tests for an infinite loop on Paste. "
+          text run at (261,0) width 320: "You should see 'Hello: ' and then an input field."
+      RenderBlock {DIV} at (0,38) size 784x30
+        RenderText {#text} at (0,4) size 35x22
+          text run at (0,4) width 35: "Hello"
+        RenderTextControl {INPUT} at (37,2) size 166x26
+        RenderText {#text} at (205,4) size 5x22
+          text run at (205,4) width 5: ":"
+layer at (47,50) size 162x22
+  RenderBlock {DIV} at (2,2) size 162x22
 caret: position 1 of child 1 {INPUT} of child 2 {DIV} of body

LayoutTests/platform/qt/editing/pasteboard/5387578-expected.txt

@@ -3,21 +3,18 @@ layer 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 784x38
-        RenderText {#text} at (0,0) size 764x38
-          text run at (0,0) width 379: "This tests for a crash when pasting content into a table cell. "
-          text run at (379,0) width 385: "The table cell has some collapsed whitespace at the end of it"
-          text run at (0,19) width 139: "that tickled the crash. "
-          text run at (139,19) width 325: "You should see 'Hello World' in the table cell below."
-      RenderBlock {DIV} at (0,52) size 784x29
-        RenderTable {TABLE} at (0,0) size 87x29 [border: (1px outset #808080)]
-          RenderTableSection {TBODY} at (1,1) size 85x27
-            RenderTableRow {TR} at (0,2) size 85x23
-              RenderTableCell {TD} at (2,2) size 81x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                RenderText {#text} at (2,2) size 49x19
-                  text run at (2,2) width 49: "Hello W"
-                RenderText {#text} at (51,2) size 24x19
-                  text run at (51,2) width 24: "orld"
-                RenderText {#text} at (75,2) size 4x19
-                  text run at (75,2) width 4: " "
-caret: position 4 of child 1 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 2 {DIV} of body
+      RenderBlock {P} at (0,0) size 784x44
+        RenderText {#text} at (0,0) size 771x44
+          text run at (0,0) width 401: "This tests for a crash when pasting content into a table cell. "
+          text run at (401,0) width 370: "The table cell has some collapsed whitespace at the end"
+          text run at (0,22) width 180: "of it that tickled the crash. "
+          text run at (180,22) width 350: "You should see 'Hello World' in the table cell below."
+      RenderBlock {DIV} at (0,60) size 784x32
+        RenderTable {TABLE} at (0,0) size 93x32 [border: (1px outset #808080)]
+          RenderTableSection {TBODY} at (1,1) size 91x30
+            RenderTableRow {TR} at (0,2) size 91x26
+              RenderTableCell {TD} at (2,2) size 87x26 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 83x22
+                  text run at (2,2) width 83: "Hello World"
+                  text run at (85,2) width 0: " \x{9}\x{9} \x{9}\x{9}"
+caret: position 11 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 2 {DIV} of body

LayoutTests/platform/qt/editing/pasteboard/bad-placeholder-expected.txt

@@ -2,29 +2,29 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML
 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 16 of #text > DIV > BODY > HTML > #document toDOMRange:range from 16 of #text > DIV > BODY > HTML > #document to 16 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 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 784x38
-        RenderText {#text} at (0,0) size 761x38
-          text run at (0,0) width 761: "This is a test to make sure that a placeholder, even one without our special class on it, is removed only when it has been"
-          text run at (0,19) width 411: "collapsed away or when it has been displaced by pasted content."
-      RenderBlock {P} at (0,52) size 784x38
-        RenderText {#text} at (0,0) size 773x38
-          text run at (0,0) width 704: "Placeholders with our special class can, through bugs in deletion, be inserted into the document unnecessarily. "
-          text run at (704,0) width 62: "Once that"
-          text run at (0,19) width 773: "happens, we don't want to make matters worse by removing them if they are acting as line breaks instead of placeholders."
-      RenderBlock {DIV} at (0,104) size 784x38
-        RenderText {#text} at (0,0) size 28x19
-          text run at (0,0) width 28: "First"
-        RenderText {#text} at (28,0) size 74x19
-          text run at (28,0) width 74: " paragraph."
-        RenderBR {BR} at (102,14) size 0x0
-        RenderText {#text} at (0,19) size 122x19
-          text run at (0,19) width 122: "Second paragraph."
-caret: position 11 of child 1 {#text} of child 4 {DIV} of body
+      RenderBlock {P} at (0,0) size 784x44
+        RenderText {#text} at (0,0) size 764x44
+          text run at (0,0) width 764: "This is a test to make sure that a placeholder, even one without our special class on it, is removed only when it has"
+          text run at (0,22) width 468: "been collapsed away or when it has been displaced by pasted content."
+      RenderBlock {P} at (0,60) size 784x66
+        RenderText {#text} at (0,0) size 779x66
+          text run at (0,0) width 744: "Placeholders with our special class can, through bugs in deletion, be inserted into the document unnecessarily. "
+          text run at (744,0) width 35: "Once"
+          text run at (0,22) width 758: "that happens, we don't want to make matters worse by removing them if they are acting as line breaks instead of"
+          text run at (0,44) width 89: "placeholders."
+      RenderBlock {DIV} at (0,142) size 784x44
+        RenderText {#text} at (0,0) size 113x22
+          text run at (0,0) width 113: "First paragraph."
+        RenderBR {BR} at (113,16) size 0x0
+        RenderText {#text} at (0,22) size 130x22
+          text run at (0,22) width 130: "Second paragraph."
+caret: position 16 of child 0 {#text} of child 4 {DIV} of body