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

        Reviewed by Darin Adler.

        Rebaseline editing/inserting tests that work
        https://bugs.webkit.org/show_bug.cgi?id=60702

        * platform/qt/Skipped:
        * platform/qt/editing/inserting/4278698-expected.png: Added.
        * platform/qt/editing/inserting/4278698-expected.txt:
        * platform/qt/editing/inserting/editable-html-element-expected.png: Added.
        * platform/qt/editing/inserting/editable-html-element-expected.txt:
        * platform/qt/editing/inserting/editing-empty-divs-expected.png: Added.
        * platform/qt/editing/inserting/editing-empty-divs-expected.txt:
        * platform/qt/editing/inserting/insert-div-023-expected.png: Added.
        * platform/qt/editing/inserting/insert-div-023-expected.txt:
        * platform/qt/editing/inserting/multiple-lines-selected-expected.png: Added.
        * platform/qt/editing/inserting/multiple-lines-selected-expected.txt: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86357 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f939504c
2011-05-12 Chang Shu <cshu@webkit.org>
Reviewed by Darin Adler.
Rebaseline editing/inserting tests that work
https://bugs.webkit.org/show_bug.cgi?id=60702
* platform/qt/Skipped:
* platform/qt/editing/inserting/4278698-expected.png: Added.
* platform/qt/editing/inserting/4278698-expected.txt:
* platform/qt/editing/inserting/editable-html-element-expected.png: Added.
* platform/qt/editing/inserting/editable-html-element-expected.txt:
* platform/qt/editing/inserting/editing-empty-divs-expected.png: Added.
* platform/qt/editing/inserting/editing-empty-divs-expected.txt:
* platform/qt/editing/inserting/insert-div-023-expected.png: Added.
* platform/qt/editing/inserting/insert-div-023-expected.txt:
* platform/qt/editing/inserting/multiple-lines-selected-expected.png: Added.
* platform/qt/editing/inserting/multiple-lines-selected-expected.txt: Added.
2011-05-12 Rob Buis <rwlbuis@gmail.com>
Reviewed by Darin Adler.
......@@ -327,13 +327,8 @@ editing/inserting/caret-position.html
fast/dom/tab-in-right-alignment.html
svg/text/caret-in-svg-text.xhtml
# ---- to be reviewed
editing/inserting/4278698.html
editing/inserting/editable-html-element.html
editing/inserting/editing-empty-divs.html
editing/inserting/insert-div-023.html
editing/inserting/multiple-lines-selected.html
editing/inserting/5994480-2.html
editing/inserting/typing-at-end-of-line.html
# http://bugreports.qt.nokia.com/browse/QTBUG-15566
http/tests/xmlhttprequest/basic-auth-nouser.html
......
......@@ -3,7 +3,8 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > PRE > DIV > BODY > HTML > #document to 2 of #text > PRE > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
......@@ -11,16 +12,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 784x38
RenderText {#text} at (0,0) size 780x38
text run at (0,0) width 780: "This tests to see if inserting a space inside normal whitespace inside of a whitespace:pre element will collapse other spaces"
text run at (0,19) width 91: "surrounding it."
RenderBlock {P} at (0,52) size 784x19
RenderText {#text} at (0,0) size 441x19
text run at (0,0) width 441: "If successful, you should see 'a' followed by 10 spaces followed by 'b'."
RenderBlock {HR} at (0,85) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,94) size 784x27 [border: (2px solid #FFAAAA)]
RenderBlock {PRE} at (2,2) size 780x23 [border: (2px solid #AAAAFF)]
RenderText {#text} at (2,3) size 96x17
text run at (2,3) width 96: "a b"
RenderBlock {P} at (0,0) size 784x44
RenderText {#text} at (0,0) size 766x44
text run at (0,0) width 766: "This tests to see if inserting a space inside normal whitespace inside of a whitespace:pre element will collapse other"
text run at (0,22) width 149: "spaces surrounding it."
RenderBlock {P} at (0,60) size 784x22
RenderText {#text} at (0,0) size 463x22
text run at (0,0) width 463: "If successful, you should see 'a' followed by 10 spaces followed by 'b'."
RenderBlock {HR} at (0,98) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,108) size 784x25 [border: (2px solid #FFAAAA)]
RenderBlock {PRE} at (2,2) size 780x21 [border: (2px solid #AAAAFF)]
RenderText {#text} at (2,2) size 54x17
text run at (2,2) width 54: "a b"
caret: position 3 of child 0 {#text} of child 1 {PRE} of child 7 {DIV} of body
......@@ -16,12 +16,13 @@ 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 (anonymous) at (0,0) size 784x57
RenderText {#text} at (0,0) size 784x57
text run at (0,0) width 781: "This tests to make sure that when the enclosing block is the body element, and when the html element is editable, inserting"
text run at (781,0) width 3: " "
text run at (0,19) width 778: "a paragraph separator doesn't split the body (inserting a paragraph separator usually splits/clones the enclosing block flow "
text run at (0,38) width 60: "element)."
RenderBlock {DIV} at (0,57) size 784x19
RenderBR {BR} at (0,0) size 0x19
RenderBlock (anonymous) at (0,0) size 784x66
RenderText {#text} at (0,0) size 757x66
text run at (0,0) width 757: "This tests to make sure that when the enclosing block is the body element, and when the html element is editable,"
text run at (0,22) width 750: "inserting a paragraph separator doesn't split the body (inserting a paragraph separator usually splits/clones the"
text run at (750,22) width 4: " "
text run at (0,44) width 201: "enclosing block flow element)."
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,66) size 784x22
RenderBR {BR} at (0,0) size 0x22
caret: position 0 of child 0 {BR} of child 2 {DIV} of body
EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: shouldEndEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
......@@ -39,43 +43,45 @@ 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 770x38
text run at (0,0) width 562: "This tests the ability to start editing in blocks that are visible, but have little or no content. "
text run at (562,0) width 208: "Each of the divs below should be"
text run at (0,19) width 141: "able to accept a caret."
RenderBlock {P} at (0,52) size 784x19
RenderText {#text} at (0,0) size 176x19
text run at (0,0) width 176: "This div contains some text."
RenderBlock {DIV} at (0,85) size 707x22 [border: (1px dotted #0000FF)]
RenderText {#text} at (1,1) size 37x19
text run at (1,1) width 37: "chello"
RenderBlock {P} at (0,121) size 784x19
RenderText {#text} at (0,0) size 182x19
text run at (0,0) width 182: "This div is completely empty."
RenderBlock {DIV} at (0,154) size 707x22 [border: (1px dotted #0000FF)]
RenderText {#text} at (1,1) size 7x19
RenderBlock {P} at (0,0) size 784x44
RenderText {#text} at (0,0) size 757x44
text run at (0,0) width 605: "This tests the ability to start editing in blocks that are visible, but have little or no content. "
text run at (605,0) width 152: "Each of the divs below"
text run at (0,22) width 215: "should be able to accept a caret."
RenderBlock {P} at (0,60) size 784x22
RenderText {#text} at (0,0) size 186x22
text run at (0,0) width 186: "This div contains some text."
RenderBlock {DIV} at (0,98) size 707x24 [border: (1px dotted #0000FF)]
RenderText {#text} at (1,1) size 39x22
text run at (1,1) width 39: "chello"
RenderBlock {P} at (0,138) size 784x22
RenderText {#text} at (0,0) size 195x22
text run at (0,0) width 195: "This div is completely empty."
RenderBlock {DIV} at (0,176) size 707x24 [border: (1px dotted #0000FF)]
RenderText {#text} at (1,1) size 7x22
text run at (1,1) width 7: "c"
RenderBlock {P} at (0,190) size 784x19
RenderText {#text} at (0,0) size 343x19
text run at (0,0) width 343: "This div contains some collapsable whitespace (a '\\n')."
RenderBlock {DIV} at (0,223) size 707x22 [border: (1px dotted #0000FF)]
RenderText {#text} at (1,1) size 7x19
RenderBlock {P} at (0,216) size 784x22
RenderText {#text} at (0,0) size 360x22
text run at (0,0) width 360: "This div contains some collapsable whitespace (a '\\n')."
RenderBlock {DIV} at (0,254) size 707x24 [border: (1px dotted #0000FF)]
RenderText {#text} at (1,1) size 7x22
text run at (1,1) width 7: "c"
RenderBlock {P} at (0,259) size 784x19
RenderText {#text} at (0,0) size 233x19
text run at (0,0) width 233: "This div contains a self-closing p tag."
RenderBlock {DIV} at (0,292) size 707x35 [border: (1px dotted #0000FF)]
RenderBlock (anonymous) at (1,1) size 705x19
RenderText {#text} at (0,0) size 7x19
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,294) size 784x22
RenderText {#text} at (0,0) size 246x22
text run at (0,0) width 246: "This div contains a self-closing p tag."
RenderBlock {DIV} at (0,332) size 707x40 [border: (1px dotted #0000FF)]
RenderBlock (anonymous) at (1,1) size 705x22
RenderText {#text} at (0,0) size 7x22
text run at (0,0) width 7: "c"
RenderBlock {P} at (1,34) size 705x0
RenderBlock {P} at (0,341) size 784x19
RenderText {#text} at (0,0) size 726x19
text run at (0,0) width 726: "This div contains a self-closing p tag and some collapsable whitespace (two '\\n's before and after the self closing p."
RenderBlock {DIV} at (0,374) size 707x35 [border: (1px dotted #0000FF)]
RenderBlock (anonymous) at (1,1) size 705x19
RenderText {#text} at (0,0) size 7x19
RenderBlock {P} at (1,39) size 705x0
RenderBlock {P} at (0,388) size 784x22
RenderText {#text} at (0,0) size 762x22
text run at (0,0) width 762: "This div contains a self-closing p tag and some collapsable whitespace (two '\\n's before and after the self closing p."
RenderBlock {DIV} at (0,426) size 707x40 [border: (1px dotted #0000FF)]
RenderBlock (anonymous) at (1,1) size 705x22
RenderText {#text} at (0,0) size 7x22
text run at (0,0) width 7: "c"
RenderBlock {P} at (1,34) size 705x0
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (1,39) size 705x0
caret: position 1 of child 0 {#text} of child 21 {DIV} of body
......@@ -25,42 +25,43 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > B > P > BODY > HTML > #document to 1 of #text > B > P > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x731
RenderView at (0,0) size 800x600
layer at (0,0) size 800x731
RenderBlock {HTML} at (0,0) size 800x731
RenderBody {BODY} at (8,8) size 784x699
RenderBlock (anonymous) at (0,0) size 784x96
RenderText {#text} at (0,0) size 766x63
text run at (0,0) width 766: "Test inserting paragraphs and managing typing style correctly: \"x\" under "
text run at (0,32) width 419: "\"line 2\" should be bold. Fix for this bug: "
RenderInline {A} at (0,0) size 274x31 [color=#0000EE]
RenderText {#text} at (419,32) size 274x31
text run at (419,32) width 274: "<rdar://problem/3939523>"
RenderText {#text} at (693,32) size 784x63
text run at (693,32) width 90: " in some"
text run at (783,32) width 1: " "
text run at (0,64) width 661: "cases, text does not retain style info after pressing return twice"
RenderBlock {DIV} at (0,96) size 784x12
RenderBlock {P} at (0,132) size 784x60 [border: (2px solid #0000FF)]
RenderText {#text} at (14,14) size 56x31
layer at (0,0) size 784x738
RenderView at (0,0) size 784x600
layer at (0,0) size 784x738
RenderBlock {HTML} at (0,0) size 784x738
RenderBody {BODY} at (8,8) size 768x706
RenderBlock (anonymous) at (0,0) size 768x99
RenderText {#text} at (0,0) size 765x66
text run at (0,0) width 759: "Test inserting paragraphs and managing typing style correctly: \"x\" under"
text run at (759,0) width 6: " "
text run at (0,33) width 420: "\"line 2\" should be bold. Fix for this bug: "
RenderInline {A} at (0,0) size 275x33 [color=#0000EE]
RenderText {#text} at (420,33) size 275x33
text run at (420,33) width 275: "<rdar://problem/3939523>"
RenderText {#text} at (695,33) size 727x66
text run at (695,33) width 26: " in"
text run at (721,33) width 6: " "
text run at (0,66) width 698: "some cases, text does not retain style info after pressing return twice"
RenderBlock {DIV} at (0,99) size 768x12
RenderBlock {P} at (0,135) size 768x61 [border: (2px solid #0000FF)]
RenderText {#text} at (14,14) size 56x33
text run at (14,14) width 56: "line 1"
RenderBlock {P} at (0,216) size 784x60 [border: (2px solid #0000FF)]
RenderBR {BR} at (14,14) size 0x31 [bgcolor=#008000]
RenderBlock {P} at (0,300) size 784x61 [border: (2px solid #0000FF)]
RenderInline {B} at (0,0) size 62x33
RenderText {#text} at (14,14) size 62x33
text run at (14,14) width 62: "line 2"
RenderBlock {P} at (0,385) size 784x61 [border: (2px solid #0000FF)]
RenderBlock {P} at (0,220) size 768x61 [border: (2px solid #0000FF)]
RenderBR {BR} at (14,14) size 0x33 [bgcolor=#008000]
RenderBlock {P} at (0,305) size 768x61 [border: (2px solid #0000FF)]
RenderInline {B} at (0,0) size 56x33
RenderText {#text} at (14,14) size 56x33
text run at (14,14) width 56: "line 2"
RenderBlock {P} at (0,390) size 768x61 [border: (2px solid #0000FF)]
RenderInline {B} at (0,0) size 0x33
RenderBR {BR} at (14,14) size 0x33 [bgcolor=#008000]
RenderBlock {P} at (0,470) size 784x61 [border: (2px solid #0000FF)]
RenderInline {B} at (0,0) size 13x33
RenderText {#text} at (14,14) size 13x33
text run at (14,14) width 13: "x"
RenderBlock {P} at (0,555) size 784x60 [border: (2px solid #0000FF)]
RenderBR {BR} at (14,14) size 0x31 [bgcolor=#008000]
RenderBlock {P} at (0,639) size 784x60 [border: (2px solid #0000FF)]
RenderText {#text} at (14,14) size 56x31
RenderBlock {P} at (0,475) size 768x61 [border: (2px solid #0000FF)]
RenderInline {B} at (0,0) size 12x33
RenderText {#text} at (14,14) size 12x33
text run at (14,14) width 12: "x"
RenderBlock {P} at (0,560) size 768x61 [border: (2px solid #0000FF)]
RenderBR {BR} at (14,14) size 0x33 [bgcolor=#008000]
RenderBlock {P} at (0,645) size 768x61 [border: (2px solid #0000FF)]
RenderText {#text} at (14,14) size 56x33
text run at (14,14) width 56: "line 3"
caret: position 1 of child 0 {#text} of child 0 {B} of child 11 {P} of body
EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 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: 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
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 784x44
RenderText {#text} at (0,0) size 776x44
text run at (0,0) width 610: "This tests inserting a paragraph separator into a selection that spans multiple paragraphs. "
text run at (610,0) width 166: "'ar' should be on the line"
text run at (0,22) width 336: "after 'f' and the caret should be just before the 'a'."
RenderBlock {DIV} at (0,60) size 784x44
RenderBlock {DIV} at (0,0) size 784x22
RenderText {#text} at (0,0) size 5x22
text run at (0,0) width 5: "f"
RenderBlock {DIV} at (0,22) size 784x22
RenderText {#text} at (0,0) size 15x22
text run at (0,0) width 15: "ar"
caret: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment