diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 20:13:05 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 20:13:05 +0000 |
| commit | 3f8772441c6fe0d59aff029a162418a70e251b26 (patch) | |
| tree | 463ddc9da1b7b81f3e6ae6d8c67afc649db8e18c /webkit/data | |
| parent | 15224a9efacdc13c7050cdfddbc53f280c7cec49 (diff) | |
| download | chromium_src-3f8772441c6fe0d59aff029a162418a70e251b26.zip chromium_src-3f8772441c6fe0d59aff029a162418a70e251b26.tar.gz chromium_src-3f8772441c6fe0d59aff029a162418a70e251b26.tar.bz2 | |
Rebaseline some layout tests.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/986002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
48 files changed, 420 insertions, 72 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/non-smart-delete-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/non-smart-delete-expected.checksum new file mode 100644 index 0000000..6b0c8ae --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/non-smart-delete-expected.checksum @@ -0,0 +1 @@ +59f503f5947551c579cb5bcdf66833e9
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-001-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-001-expected.txt new file mode 100644 index 0000000..a2d9adf --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-001-expected.txt @@ -0,0 +1,37 @@ +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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 4 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document 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 {DIV} at (0,0) size 784x210 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (14,14) size 756x55 + RenderText {#text} at (0,0) size 66x26 + text run at (0,0) width 66: "Tests: " + RenderBR {BR} at (0,0) size 0x0 + RenderText {#text} at (0,27) size 489x27 + text run at (0,27) width 489: "Smart delete when deleting the first word on a line." + RenderBlock {DIV} at (14,85) size 756x111 + RenderText {#text} at (0,0) size 189x26 + text run at (0,0) width 189: "Expected Results: " + RenderBR {BR} at (189,21) size 0x0 + RenderText {#text} at (0,27) size 705x55 + text run at (0,27) width 705: "The first word and the space following the first word should be deleted. It" + text run at (0,55) width 196: "should like this this: " + RenderBR {BR} at (196,76) size 0x0 + RenderText {#text} at (0,83) size 70x27 + text run at (0,83) width 70: "bar baz" + RenderBlock {DIV} at (0,234) size 784x32 + RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 70x27 + text run at (2,2) width 70: "bar baz" +caret: position 0 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-002-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-002-expected.txt new file mode 100644 index 0000000..0146b73 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-002-expected.txt @@ -0,0 +1,39 @@ +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: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > DIV > BODY > HTML > #document to 4 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 {DIV} at (0,0) size 784x210 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (14,14) size 756x55 + RenderText {#text} at (0,0) size 66x26 + text run at (0,0) width 66: "Tests: " + RenderBR {BR} at (0,0) size 0x0 + RenderText {#text} at (0,27) size 514x27 + text run at (0,27) width 514: "Smart delete when deleting the second word of a line." + RenderBlock {DIV} at (14,85) size 756x111 + RenderText {#text} at (0,0) size 189x26 + text run at (0,0) width 189: "Expected Results: " + RenderBR {BR} at (189,21) size 0x0 + RenderText {#text} at (0,27) size 735x55 + text run at (0,27) width 735: "The second word and the space before the second word should be deleted. It" + text run at (0,55) width 196: "should like this this: " + RenderBR {BR} at (196,76) size 0x0 + RenderText {#text} at (0,83) size 71x27 + text run at (0,83) width 71: "foo baz" + RenderBlock {DIV} at (0,234) size 784x32 + RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 71x27 + text run at (2,2) width 71: "foo baz" +caret: position 4 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.checksum index a8dd4bd..a2cebb0 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.checksum @@ -1 +1 @@ -2e7063b4cda558c4a87b5002fa13c205
\ No newline at end of file +830a57078989e3007013911145766a17
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.png Binary files differdeleted file mode 100644 index f639def..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.txt new file mode 100644 index 0000000..c4a766d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-003-expected.txt @@ -0,0 +1,27 @@ +EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 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 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldDeleteDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 1 of #text > 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: 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 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 372: "This tests deleting a selection created with a word granularity. " + text run at (372,0) width 329: "To run it manually, double click on 'bar' and hit delete. " + text run at (701,0) width 69: "You should" + text run at (0,20) width 79: "see 'foo baz'." + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 20x19 + text run at (0,0) width 20: "foo" + RenderText {#text} at (20,0) size 25x19 + text run at (20,0) width 25: " baz" +caret: position 3 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.checksum index 650b693..00f2775 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.checksum @@ -1 +1 @@ -ac34bb350964528cfd0f366b5f606769
\ No newline at end of file +e8c0e4552b2574f7e3b59949017ca8da
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.png Binary files differdeleted file mode 100644 index ce13635..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.txt new file mode 100644 index 0000000..aa997fb --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/smart-delete-004-expected.txt @@ -0,0 +1,27 @@ +EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 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 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldDeleteDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 1 of #text > 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: 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 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 372: "This tests deleting a selection created with a word granularity. " + text run at (372,0) width 381: "To run it manually, double click on 'bar' and hit forward delete. " + text run at (753,0) width 26: "You" + text run at (0,20) width 122: "should see 'foo baz'." + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 20x19 + text run at (0,0) width 20: "foo" + RenderText {#text} at (20,0) size 25x19 + text run at (20,0) width 25: " baz" +caret: position 3 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum index 7d24e0c..8f4faea 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum @@ -1 +1 @@ -23682ed637cb6439e03d288cd0c340b4
\ No newline at end of file +081f4ab5b33d9f89dc464e598ac75b96
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png Binary files differdeleted file mode 100644 index 62fd846..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-drag-drop-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-drag-drop-expected.checksum new file mode 100644 index 0000000..e73b33e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-drag-drop-expected.checksum @@ -0,0 +1 @@ +d29729d8e01e67e82668e299634362bb
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-drag-drop-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-drag-drop-expected.txt new file mode 100644 index 0000000..1ad619e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-drag-drop-expected.txt @@ -0,0 +1,27 @@ +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: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionDropped +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 6 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 784x40 + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Tests that drag/drop after double-click does a smart drag. Specifically the end result should have a space: \"world hello\". To test" + text run at (0,20) width 380: "manually double click on the \"hello\" and drag it to after \"world\"." + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 35: "world" + RenderText {#text} at (35,0) size 32x19 + text run at (35,0) width 32: " hello" +selection start: position 0 of child 1 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 6 of child 1 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt new file mode 100644 index 0000000..320330f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt @@ -0,0 +1,45 @@ +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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 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 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 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 {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (14,14) size 756x55 + RenderText {#text} at (0,0) size 66x26 + text run at (0,0) width 66: "Tests: " + RenderBR {BR} at (0,0) size 0x0 + RenderText {#text} at (0,27) size 734x27 + text run at (0,27) width 734: "Smart paste when pasting after a word and before a space and another word." + RenderBlock {DIV} at (14,85) size 756x139 + RenderText {#text} at (0,0) size 189x26 + text run at (0,0) width 189: "Expected Results: " + RenderBR {BR} at (189,21) size 0x0 + RenderText {#text} at (0,27) size 716x83 + text run at (0,27) width 716: "A space should be added between the preexisting word and the word that's" + text run at (0,55) width 712: "pasted. No space should be added after the pasted word. It should like this" + text run at (0,83) width 46: "this: " + RenderBR {BR} at (46,104) size 0x0 + RenderText {#text} at (0,111) size 114x27 + text run at (0,111) width 114: "test test test" + RenderBlock {DIV} at (0,262) size 784x32 + RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 34x27 + text run at (2,2) width 34: "test" + RenderText {#text} at (36,2) size 40x27 + text run at (36,2) width 40: " test" + RenderText {#text} at (76,2) size 40x27 + text run at (76,2) width 40: " test" + RenderBlock (anonymous) at (0,32) size 784x0 +caret: position 5 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt new file mode 100644 index 0000000..9170b27 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt @@ -0,0 +1,46 @@ +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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 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 {DIV} at (0,0) size 784x210 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (14,14) size 756x55 + RenderText {#text} at (0,0) size 66x26 + text run at (0,0) width 66: "Tests: " + RenderBR {BR} at (0,0) size 0x0 + RenderText {#text} at (0,27) size 676x27 + text run at (0,27) width 676: "Smart paste when pasting after word and a space before another word." + RenderBlock {DIV} at (14,85) size 756x111 + RenderText {#text} at (0,0) size 189x26 + text run at (0,0) width 189: "Expected Results: " + RenderBR {BR} at (189,21) size 0x0 + RenderText {#text} at (0,27) size 720x55 + text run at (0,27) width 720: "A space should be added after the pasted word before the other preexisting" + text run at (0,55) width 61: "word. " + text run at (61,55) width 217: "It should like this this: " + RenderBR {BR} at (278,76) size 0x0 + RenderText {#text} at (0,83) size 114x27 + text run at (0,83) width 114: "test test test" + RenderBlock {DIV} at (0,234) size 784x32 + 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 40x27 + text run at (42,2) width 40: "test " + RenderText {#text} at (82,2) size 34x27 + text run at (82,2) width 34: "test" + RenderBlock (anonymous) at (0,32) size 784x0 +caret: position 5 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.checksum index 4695812..c7fc71e 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.checksum @@ -1 +1 @@ -c8e9c700fc535d024ecb373c4491634f
\ No newline at end of file +0213345f3204505aad09ddfc8956eb06
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.png Binary files differdeleted file mode 100644 index 8dd2ca3..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.checksum new file mode 100644 index 0000000..dff150c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.checksum @@ -0,0 +1 @@ +7d054b9eea2bfee5760a0f8b7c04faea
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.txt new file mode 100644 index 0000000..345b389 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.txt @@ -0,0 +1,36 @@ +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: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document 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 {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (14,14) size 756x55 + RenderText {#text} at (0,0) size 66x26 + text run at (0,0) width 66: "Tests: " + RenderBR {BR} at (0,0) size 0x0 + RenderText {#text} at (0,27) size 635x27 + text run at (0,27) width 635: "Non-smart delete when deleting a word selected via the keyboard." + RenderBlock {DIV} at (14,85) size 756x139 + RenderText {#text} at (0,0) size 189x26 + text run at (0,0) width 189: "Expected Results: " + RenderBR {BR} at (189,21) size 0x0 + RenderText {#text} at (0,27) size 702x83 + text run at (0,27) width 702: "The first word should be deleted. The space following it should remain. It" + text run at (0,55) width 661: "should look like this (currently this is broken and the space is deleted" + text run at (0,83) width 479: "https://bugs.webkit.org/show_bug.cgi?id=35314): " + RenderBR {BR} at (479,104) size 0x0 + RenderText {#text} at (0,111) size 96x27 + text run at (0,111) width 96: "\" bar baz\"" + RenderBlock {DIV} at (0,262) size 784x32 + RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 70x27 + text run at (2,2) width 70: "bar baz" +caret: position 0 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-001-expected.txt index 210545b..1b8181e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-001-expected.txt @@ -1,9 +1,11 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document 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 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.checksum index c2e9353..e9b5877 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.checksum @@ -1 +1 @@ -7f933cb623b11b7f9fb8fe0eb9ec1488
\ No newline at end of file +53d83101bfbac8d5dc3d4a32f204d52a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.png Binary files differdeleted file mode 100644 index 23355c9..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.txt index d5e0086..1ef94ed 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-002-expected.txt @@ -3,9 +3,11 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 5 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: shouldDeleteDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > BODY > HTML > #document -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > DIV > BODY > HTML > #document to 4 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 9 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 8 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 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 @@ -34,4 +36,4 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] RenderText {#text} at (2,2) size 71x27 text run at (2,2) width 71: "foo baz" -caret: position 4 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 5 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.checksum index b27004d..a649f68 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.checksum @@ -1 +1 @@ -92b380128150a447923405372e289143
\ No newline at end of file +2968f57dca05a8c5deb7dab9f05b91cf
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.png Binary files differdeleted file mode 100644 index 8a62a8b..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.txt index 7332ff2..c5a9b6fb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-003-expected.txt @@ -1,11 +1,11 @@ -EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document +EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 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 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldDeleteDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > BODY > HTML > #document -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 7 of #text > 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: shouldDeleteDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -18,8 +18,10 @@ layer at (0,0) size 800x600 text run at (0,0) width 372: "This tests deleting a selection created with a word granularity. " text run at (372,0) width 329: "To run it manually, double click on 'bar' and hit delete. " text run at (701,0) width 69: "You should" - text run at (0,20) width 78: "see 'foo bar'." + text run at (0,20) width 79: "see 'foo baz'." RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 45x19 - text run at (0,0) width 45: "foo baz" -caret: position 3 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document + RenderText {#text} at (0,0) size 24x19 + text run at (0,0) width 24: "foo " + RenderText {#text} at (24,0) size 21x19 + text run at (24,0) width 21: "baz" +caret: position 4 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.checksum index f28bf8d..8c69d1b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.checksum @@ -1 +1 @@ -69e2e54ea5c5c980cd6df9b8a9789ba5
\ No newline at end of file +0f1fa63fc11602104f0643039dab84be
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.png Binary files differdeleted file mode 100644 index b9a76f6..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.txt index e31e6dd..502bd75 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/smart-delete-004-expected.txt @@ -1,11 +1,11 @@ -EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document +EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 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 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldDeleteDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > BODY > HTML > #document -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 7 of #text > 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: shouldDeleteDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -18,8 +18,10 @@ layer at (0,0) size 800x600 text run at (0,0) width 372: "This tests deleting a selection created with a word granularity. " text run at (372,0) width 381: "To run it manually, double click on 'bar' and hit forward delete. " text run at (753,0) width 26: "You" - text run at (0,20) width 121: "should see 'foo bar'." + text run at (0,20) width 122: "should see 'foo baz'." RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 45x19 - text run at (0,0) width 45: "foo baz" -caret: position 3 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document + RenderText {#text} at (0,0) size 24x19 + text run at (0,0) width 24: "foo " + RenderText {#text} at (24,0) size 21x19 + text run at (24,0) width 21: "baz" +caret: position 4 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum index 2c47594..80e6441 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.checksum @@ -1 +1 @@ -afc5d533b607b78e5799331f2c8a4353
\ No newline at end of file +e7283daf4db514e578e66de5f5878d76
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png Binary files differdeleted file mode 100644 index 6c6999b..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.txt index f514f1e..02a8434 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.txt @@ -12,10 +12,11 @@ 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 726x19 - text run at (0,0) width 726: "This test does a drag and drop such that the selection around the dragged word is no longer in the document on the drop." - RenderBlock {DIV} at (0,36) size 784x20 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 771x39 + text run at (0,0) width 771: "This tests non-smartmove drag/drop. The space should be deleted on move, but not reinserted on drop, resulting in \"worldhello\"." + text run at (0,20) width 675: "Currently there's a bug (https://bugs.webkit.org/show_bug.cgi?id=35314) where the space is reinserted on drop." + RenderBlock {DIV} at (0,56) size 784x20 RenderText {#text} at (0,0) size 35x19 text run at (0,0) width 35: "world" RenderText {#text} at (35,0) size 32x19 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-drag-drop-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-drag-drop-expected.checksum new file mode 100644 index 0000000..aa066f0 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-drag-drop-expected.checksum @@ -0,0 +1 @@ +3f9a23079c836519c44d30b75ac3a83c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-drag-drop-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-drag-drop-expected.txt new file mode 100644 index 0000000..b3cbacd --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-drag-drop-expected.txt @@ -0,0 +1,30 @@ +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: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionDropped +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 1 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 784x40 + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Tests that drag/drop after double-click does a smart drag. Specifically the end result should have a space: \"world hello\". To test" + text run at (0,20) width 380: "manually double click on the \"hello\" and drag it to after \"world\"." + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 35: "world" + RenderInline {SPAN} at (0,0) size 32x19 + RenderText {#text} at (35,0) size 32x19 + text run at (35,0) width 32: " hello" + RenderText {#text} at (67,0) size 4x19 + text run at (67,0) width 4: " " +selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 2 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt index 0148d34..9c306fd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-001-expected.txt @@ -1,6 +1,8 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 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 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt index 617cdf1..60ede16 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-002-expected.txt @@ -1,6 +1,8 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.checksum index 9332ad2..e2ca4d3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.checksum @@ -1 +1 @@ -7043b1d55f9f23c07411d4da5ea7874d
\ No newline at end of file +cc825840365e54708f0cab52f88c2fbf
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.png Binary files differdeleted file mode 100644 index 7e53d44..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt index b36539a..802767d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-003-expected.txt @@ -1,11 +1,13 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 6 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 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -33,11 +35,14 @@ layer at (0,0) size 800x600 text run at (0,111) width 114: "test test test" RenderBlock {DIV} at (0,262) size 784x32 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - RenderText {#text} at (2,2) size 34x27 - text run at (2,2) width 34: "test" - RenderText {#text} at (36,2) size 40x27 - text run at (36,2) width 40: " test" - RenderText {#text} at (76,2) size 40x27 - text run at (76,2) width 40: " test" + 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 (88,2) size 34x27 + text run at (88,2) width 34: "test" RenderBlock (anonymous) at (0,32) size 784x0 -caret: position 5 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 2 of child 0 {#text} of child 2 {SPAN} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.checksum index 527eb6e..002902d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.checksum @@ -1 +1 @@ -2c9cf9826b7a725390fa9e01898fdd8b
\ No newline at end of file +573bdb82307b61434b6e162b690f86c0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.png Binary files differdeleted file mode 100644 index 828c5e8..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt index 95d14bf..30472c0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-004-expected.txt @@ -1,12 +1,14 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +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: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -34,11 +36,14 @@ layer at (0,0) size 800x600 text run at (0,83) width 114: "test test test" RenderBlock {DIV} at (0,234) size 784x32 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 40x27 - text run at (42,2) width 40: "test " - RenderText {#text} at (82,2) size 34x27 - text run at (82,2) width 34: "test" + 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 (101,2) size 27x27 + text run at (101,2) width 27: "est" RenderBlock (anonymous) at (0,32) size 784x0 -caret: position 5 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 2 of child 0 {#text} of child 2 {SPAN} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt index 41c2881..735e348 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-005-expected.txt @@ -1,6 +1,8 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt index 029427e..7a18d96 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-007-expected.txt @@ -1,6 +1,8 @@ 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 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-008-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-008-expected.txt index 410d92f..43c8456 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-008-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/smart-paste-008-expected.txt @@ -1,6 +1,8 @@ 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: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.checksum index d40b9a2..372b149f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.checksum @@ -1 +1 @@ -7ef4442fa3953645c8d82176e603e8db
\ No newline at end of file +7f9c505a23c4b1d6e6ff2c381caa4417
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.png Binary files differdeleted file mode 100644 index 1e2248b..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.txt index 2cb2ac8..b441d8f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.txt @@ -24,7 +24,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 5 of #text > B > DIV > DIV > BODY > HTML > #document to 5 of #text > B > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > B > DIV > DIV > BODY > HTML > #document to 5 of #text > B > DIV > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > SPAN > B > DIV > DIV > BODY > HTML > #document to 4 of #text > SPAN > B > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > B > DIV > DIV > BODY > HTML > #document to 5 of #text > B > DIV > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > DIV > BODY > HTML > #document to 4 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 @@ -32,39 +32,40 @@ 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 {DIV} at (0,0) size 784x182 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x55 RenderText {#text} at (0,0) size 66x26 text run at (0,0) width 66: "Tests: " RenderBR {BR} at (0,0) size 0x0 RenderText {#text} at (0,27) size 694x27 text run at (0,27) width 694: "Pasting at style boundary does not crash or produce empty style span(s)." - RenderBlock {DIV} at (14,85) size 756x83 - RenderBlock (anonymous) at (0,0) size 756x55 + RenderBlock {DIV} at (14,85) size 756x139 + RenderBlock (anonymous) at (0,0) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,21) size 0x0 - RenderText {#text} at (0,27) size 436x27 - text run at (0,27) width 436: "Should see this content in the red box below: " - RenderBR {BR} at (436,48) size 0x0 - RenderBlock {DIV} at (0,55) size 756x28 + RenderText {#text} at (0,27) size 716x83 + text run at (0,27) width 716: "Should see this content in the red box below (currently there's a bug where" + text run at (0,55) width 431: "there is an extra space after the bold element" + text run at (0,83) width 479: "https://bugs.webkit.org/show_bug.cgi?id=35314): " + RenderBR {BR} at (479,104) size 0x0 + RenderBlock {DIV} at (0,111) size 756x28 RenderText {#text} at (0,0) size 138x27 text run at (0,0) width 138: "one two three " RenderInline {B} at (0,0) size 43x26 RenderText {#text} at (138,0) size 43x26 text run at (138,0) width 43: "four" - RenderText {#text} at (181,0) size 41x27 - text run at (181,0) width 41: " one" - RenderBlock {DIV} at (0,206) size 784x24 + RenderText {#text} at (181,0) size 35x27 + text run at (181,0) width 35: "one" + RenderBlock {DIV} at (0,262) size 784x24 RenderBlock {DIV} at (0,0) size 784x24 [border: (2px solid #FF0000)] RenderText {#text} at (2,2) size 83x19 text run at (2,2) width 83: "one two three" - RenderInline {B} at (0,0) size 57x19 + RenderInline {B} at (0,0) size 31x19 RenderText {#text} at (85,2) size 31x19 text run at (85,2) width 31: " four" - RenderInline {SPAN} at (0,0) size 26x19 - RenderText {#text} at (116,2) size 26x19 - text run at (116,2) width 26: " one" + RenderText {#text} at (116,2) size 26x19 + text run at (116,2) width 26: " one" RenderBlock (anonymous) at (0,24) size 784x0 RenderText {#text} at (0,0) size 0x0 -caret: position 4 of child 0 {#text} of child 1 {SPAN} of child 1 {B} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 4 of child 2 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document |
