diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 23:28:03 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 23:28:03 +0000 |
| commit | 9fd123c5a72c700de328717e59a1b3d2811a7082 (patch) | |
| tree | 96969250e1d482c3f7542694662f6a0d1946bc19 /webkit/data | |
| parent | 4150ef026218967e259f7b70cce5739afb12f475 (diff) | |
| download | chromium_src-9fd123c5a72c700de328717e59a1b3d2811a7082.zip chromium_src-9fd123c5a72c700de328717e59a1b3d2811a7082.tar.gz chromium_src-9fd123c5a72c700de328717e59a1b3d2811a7082.tar.bz2 | |
Rebaseline editing layout testing
Related upstream layout test patches:
http://trac.webkit.org/changeset/46446
http://trac.webkit.org/changeset/46142
TBR=dglazkov
BUG=17883
TEST=layout test
Review URL: http://codereview.chromium.org/174098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
11 files changed, 15 insertions, 12 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.checksum index 44e4530..8980cf4 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.checksum @@ -1 +1 @@ -3a427093ff905c4d8a91662d58dee0ab
\ No newline at end of file +7ccca0775d83abe5f6ca91395ce12655
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.png Binary files differindex f40cd3d..ff7f444 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5138441-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.checksum index 0ae0552..11711bb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.checksum @@ -1 +1 @@ -b6e7e444dfdbabc09e5a50c5bc42d0d4
\ No newline at end of file +445b219a9622355f6a525384b5ae9a44
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.png Binary files differindex 33561be..07589d2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt index 69ee812..abbedc3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-3857753-fix-expected.txt @@ -22,8 +22,9 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 25x26 text run at (0,0) width 25: "on" RenderInline {SPAN} at (0,0) size 12x27 - RenderText {#text} at (25,0) size 12x27 - text run at (25,0) width 12: "o" + RenderInline {I} at (0,0) size 12x27 + RenderText {#text} at (25,0) size 12x27 + text run at (25,0) width 12: "o" RenderBlock {DIV} at (14,42) size 756x28 RenderInline {B} at (0,0) size 54x26 RenderText {#text} at (0,0) size 54x26 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/pruning-after-merge-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/pruning-after-merge-2-expected.txt index 4f76a7a..177bc9f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/pruning-after-merge-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/pruning-after-merge-2-expected.txt @@ -2,7 +2,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of #text > DIV > DIV > BODY > HTML > #document to 0 of DIV > B > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of #text > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.checksum index 5994cd4..359f374 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.checksum @@ -1 +1 @@ -66045baca179b37bfba00fdddf44bbf2
\ No newline at end of file +374887f93b39ccea8429c887fa587bf0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.png Binary files differindex e426121..83eb3ad 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5138441-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.checksum index 63589fd..646b217 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.checksum @@ -1 +1 @@ -4d9de10935875f4e1052327e75ea7c4c
\ No newline at end of file +f771224306bd156c2c08387c20f7b5e5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.png Binary files differindex f3f11e0..3bd6cad 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.txt index e6822af..213ffab 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/display-block-on-spans-expected.txt @@ -5,7 +5,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of #text > B > SPAN > DIV > BODY > HTML > #document to 4 of #text > B > SPAN > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 4 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 4 of #text > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 4 of #text > B > SPAN > B > SPAN > DIV > BODY > HTML > #document to 4 of #text > B > SPAN > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -33,9 +33,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 132x19 text run at (0,0) width 132: "This is a paragraph." RenderBlock {SPAN} at (0,20) size 784x20 - RenderInline {SPAN} at (0,0) size 175x19 - RenderText {#text} at (0,0) size 29x19 - text run at (0,0) width 29: "This" + RenderInline {B} at (0,0) size 175x19 + RenderInline {SPAN} at (0,0) size 29x19 + RenderInline {B} at (0,0) size 29x19 + RenderText {#text} at (0,0) size 29x19 + text run at (0,0) width 29: "This" RenderText {#text} at (29,0) size 146x19 text run at (29,0) width 146: " is another paragraph." -caret: position 4 of child 0 {#text} of child 0 {SPAN} of child 2 {SPAN} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 4 of child 0 {#text} of child 0 {B} of child 0 {SPAN} of child 0 {B} of child 2 {SPAN} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document |
