diff options
6 files changed, 32 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.checksum index a4b5fd9..df7696c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.checksum @@ -1 +1 @@ -f52ee0675c928d0ccccd88938fcfd08b
\ No newline at end of file +27ef328840c5f899ee5c114acab24aef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.png Binary files differindex 2ac0979..e467ad6 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-xml-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.checksum index 23929f3..ecda64b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.checksum @@ -1 +1 @@ -fc6fd396f85306e758d609277729a68f
\ No newline at end of file +a80c21024c9647310f4904ad13150fac
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.png Binary files differindex 3577fec..d8db449 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-expected.txt new file mode 100644 index 0000000..aaeee4a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-xml-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +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: shouldChangeSelectedDOMRange:range from 4 of #text > span > div > body > html > #document to 4 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 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x72 + 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 139x27 + RenderText {#text} at (14,14) size 69x27 + text run at (14,14) width 69: "foo bar" + RenderText {#text} at (83,14) size 31x27 + text run at (83,14) width 31: "bar" + RenderText {#text} at (114,14) size 39x27 + text run at (114,14) width 39: " baz" + RenderText {#text} at (0,0) size 0x0 +caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of child 3 {body} of child 1 {html} of document diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 7125dcc..f311845 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -665,9 +665,6 @@ BUG10273 LINUX : LayoutTests/http/tests/navigation/javascriptlink-frames.html = BUG20844 LINUX WIN RELEASE : LayoutTests/editing/selection/designmode-no-caret.html = FAIL BUG20844 LINUX WIN DEBUG SLOW : LayoutTests/editing/selection/designmode-no-caret.html = FAIL -// The end result looks right, but the event messages differ. -BUG21807 LINUX WIN : LayoutTests/editing/pasteboard/paste-xml.xhtml = FAIL - // Directionality of mixed-direction text in selected choice should // match that in the <select> option lists. // Low priority, unclear if test expectations are correct (see bug) |
