diff options
author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 03:33:10 +0000 |
---|---|---|
committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 03:33:10 +0000 |
commit | 6c322cb45671f41cf7e0e376b2809f44e0b29ade (patch) | |
tree | 9bed50297f5a7e59eaf0f6e487993a2873038723 /webkit/data | |
parent | cd81841e8ec6c2d1ace04df2e04b651c7a902242 (diff) | |
download | chromium_src-6c322cb45671f41cf7e0e376b2809f44e0b29ade.zip chromium_src-6c322cb45671f41cf7e0e376b2809f44e0b29ade.tar.gz chromium_src-6c322cb45671f41cf7e0e376b2809f44e0b29ade.tar.bz2 |
WebKit Roll 56165:56197.
TBR=japhet
TEST=none
BUG=maybe
Review URL: http://codereview.chromium.org/1102003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
34 files changed, 66 insertions, 69 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 index 6b0c8ae..0a334bb 100644 --- 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 @@ -1 +1 @@ -59f503f5947551c579cb5bcdf66833e9
\ No newline at end of file +cc82dc708922cffa08b380515906f2e1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/non-smart-delete-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/non-smart-delete-expected.png Binary files differnew file mode 100644 index 0000000..2b60921 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/non-smart-delete-expected.png 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 8f4faea..7549c61 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 @@ -081f4ab5b33d9f89dc464e598ac75b96
\ No newline at end of file +322ef33fd7c120a47e34054a96a8a897
\ 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 differnew file mode 100644 index 0000000..87c19f0 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.checksum index 46748d6..efaff24 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.checksum @@ -1 +1 @@ -2ad2d3fd5f11caf965a60904ae254a5e
\ No newline at end of file +488ba3c54e1ff5b28c47e3ab8882b792
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.png Binary files differindex a9e3b94..466ffe8 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-text-delay-expected.png 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 c7fc71e..440199b 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 @@ -0213345f3204505aad09ddfc8956eb06
\ No newline at end of file +e96700ca19908c2d80dd4b05a55d77fb
\ 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 differnew file mode 100644 index 0000000..6668e59 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/style-boundary-005-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum deleted file mode 100644 index b5b65e4..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -fd0e3911e82fe9e187edacee3a89a419
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.png Binary files differdeleted file mode 100644 index 0559772..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt index cbc3604..3784464 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt @@ -2,7 +2,7 @@ Attributes that are exposed in the CSS computed style object: background-attachment: scroll; background-clip: border-box; -background-color: rgba(0, 0, 0, 0); +background-color: transparent; background-image: none; background-origin: padding-box; background-position: 0% 0%; diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt index 936b19e..0a63dac 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt @@ -47,6 +47,7 @@ cancelBubble : 'false' cancelable : 'true' clipboardData : 'undefined' currentTarget : '[object XMLHttpRequest]' +defaultPrevented : 'false' eventPhase : '2' initEvent : 'function initEvent() { [native code] }' initProgressEvent : 'function initProgressEvent() { [native code] }' @@ -56,6 +57,7 @@ position : '0' preventDefault : 'function preventDefault() { [native code] }' returnValue : 'true' srcElement : '[object XMLHttpRequest]' +stopImmediatePropagation : 'function stopImmediatePropagation() { [native code] }' stopPropagation : 'function stopPropagation() { [native code] }' target : '[object XMLHttpRequest]' total : '0' diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt index 33453ce..d8d350b 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/css/getComputedStyle-basic-expected.txt @@ -2,7 +2,7 @@ rect: style.getPropertyValue(background-attachment) : scroll rect: style.getPropertyCSSValue(background-attachment) : [object CSSPrimitiveValue] rect: style.getPropertyValue(background-clip) : border-box rect: style.getPropertyCSSValue(background-clip) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(background-color) : rgba(0, 0, 0, 0) +rect: style.getPropertyValue(background-color) : transparent rect: style.getPropertyCSSValue(background-color) : [object CSSPrimitiveValue] rect: style.getPropertyValue(background-image) : none rect: style.getPropertyCSSValue(background-image) : [object CSSPrimitiveValue] @@ -416,7 +416,7 @@ g: style.getPropertyValue(background-attachment) : scroll g: style.getPropertyCSSValue(background-attachment) : [object CSSPrimitiveValue] g: style.getPropertyValue(background-clip) : border-box g: style.getPropertyCSSValue(background-clip) : [object CSSPrimitiveValue] -g: style.getPropertyValue(background-color) : rgba(0, 0, 0, 0) +g: style.getPropertyValue(background-color) : transparent g: style.getPropertyCSSValue(background-color) : [object CSSPrimitiveValue] g: style.getPropertyValue(background-image) : none g: style.getPropertyCSSValue(background-image) : [object CSSPrimitiveValue] 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 index dff150c..0a21354 100644 --- 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 @@ -1 +1 @@ -7d054b9eea2bfee5760a0f8b7c04faea
\ No newline at end of file +bc16e764a54de4191707da06f6426423
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.png Binary files differnew file mode 100644 index 0000000..f0711b1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/non-smart-delete-expected.png 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 index 345b389..3e14715 100644 --- 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 @@ -11,26 +11,25 @@ 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 784x238 [border: (2px solid #0000FF)] + 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 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 + 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 702x83 + RenderText {#text} at (0,27) size 702x55 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 + text run at (0,55) width 204: "should look like this: " + RenderBR {BR} at (204,76) size 0x0 + RenderText {#text} at (0,83) size 96x27 + text run at (0,83) width 96: "\" 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" + RenderText {#text} at (2,2) size 76x27 + text run at (2,2) width 76: " 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/execCommand/paste-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.txt index 120ad7d..f834fa1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.txt @@ -4,11 +4,11 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 4 of #text > BODY > HTML > #document to 4 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 3 of #text > BODY > HTML > #document to 3 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -27,8 +27,8 @@ layer at (0,0) size 800x600 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0] - RenderText {#text} at (0,0) size 44x19 - text run at (0,0) width 44: "foo bar" - RenderText {#text} at (44,0) size 25x19 - text run at (44,0) width 25: " baz" + RenderText {#text} at (0,0) size 48x19 + text run at (0,0) width 48: "foo bar " + RenderText {#text} at (48,0) size 21x19 + text run at (48,0) width 21: "baz" RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-2-expected.txt index 4b766b9..036e8b5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-2-expected.txt @@ -4,11 +4,11 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 4 of #text > BODY > HTML > #document to 4 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 3 of #text > BODY > HTML > #document to 3 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -27,8 +27,8 @@ layer at (0,0) size 800x600 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0] - RenderText {#text} at (0,0) size 44x19 - text run at (0,0) width 44: "foo bar" - RenderText {#text} at (44,0) size 25x19 - text run at (44,0) width 25: " baz" + RenderText {#text} at (0,0) size 48x19 + text run at (0,0) width 48: "foo bar " + RenderText {#text} at (48,0) size 21x19 + text run at (48,0) width 21: "baz" RenderText {#text} at (0,0) size 0x0 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 80e6441..49462d6 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 @@ -e7283daf4db514e578e66de5f5878d76
\ No newline at end of file +0b1a62b4387ef245b36351e6af05ba03
\ 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 differnew file mode 100644 index 0000000..df5f875 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/drag-drop-modifies-page-expected.png 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 02a8434..0f4c4c6 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 @@ -4,7 +4,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio 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: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -12,14 +12,13 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 771x39 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 771x19 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 + RenderBlock {DIV} at (0,36) 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" + RenderText {#text} at (35,0) size 28x19 + text run at (35,0) width 28: "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 +selection end: position 5 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-win/LayoutTests/editing/selection/drag-text-delay-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.checksum index 6a05ce4..6bb027a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.checksum @@ -1 +1 @@ -247efba5d2731ea37aa38958702c7eae
\ No newline at end of file +b7f950de978d29df392d30d12576e9bb
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.png Binary files differindex bad6219..bc6aafa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt index b33beca..0926a13 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 layer at (12,13) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 - RenderText {#text} at (1,0) size 61x16 - text run at (1,0) width 61: " worldhello" -selection start: position 6 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document -selection end: position 11 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document + RenderText {#text} at (1,0) size 57x16 + text run at (1,0) width 57: "worldhello" +selection start: position 5 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 10 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections-expected.txt index 3990177..90de3fb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections-expected.txt @@ -3,7 +3,6 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections2-expected.txt index ff17f2a..cc93a78 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/expanding-selections2-expected.txt @@ -3,7 +3,6 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/triple-click-in-pre-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/triple-click-in-pre-expected.txt index 42559a4..41a3e97 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/triple-click-in-pre-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/triple-click-in-pre-expected.txt @@ -5,7 +5,6 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 30 of #text > PRE > DIV > DIV > BODY > HTML > #document to 30 of #text > PRE > DIV > DIV > BODY > HTML > #document toDOMRange:range from 16 of #text > PRE > DIV > DIV > BODY > HTML > #document to 30 of #text > PRE > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 16 of #text > PRE > DIV > DIV > BODY > HTML > #document to 30 of #text > PRE > DIV > DIV > BODY > HTML > #document toDOMRange:range from 16 of #text > PRE > DIV > DIV > BODY > HTML > #document to 30 of #text > PRE > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/apply-through-end-of-document-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/apply-through-end-of-document-expected.txt index bf1e0d2..833617e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/apply-through-end-of-document-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/apply-through-end-of-document-expected.txt @@ -24,4 +24,5 @@ layer at (0,0) size 800x600 RenderBlock {PRE} at (0,148) size 784x16 RenderText {#text} at (0,0) size 24x16 text run at (0,0) width 24: "the" + RenderBR {BR} at (24,12) size 0x0 caret: position 3 of child 0 {#text} of child 7 {PRE} of child 1 {BODY} of child 0 {HTML} of document 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 372b149f..2fcfcf8 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 @@ -7f9c505a23c4b1d6e6ff2c381caa4417
\ No newline at end of file +94bf259e7e225e366347d1bec5ca4b65
\ 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 differnew file mode 100644 index 0000000..d30e868 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/style-boundary-005-expected.png 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 b441d8f..91664c3 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 > DIV > DIV > BODY > HTML > #document to 4 of #text > 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 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 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -32,24 +32,22 @@ 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 784x238 [border: (2px solid #0000FF)] + RenderBlock {DIV} at (0,0) size 784x182 [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 756x139 - RenderBlock (anonymous) at (0,0) size 756x111 + RenderBlock {DIV} at (14,85) size 756x83 + RenderBlock (anonymous) at (0,0) size 756x55 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: "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,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,0) size 138x27 text run at (0,0) width 138: "one two three " RenderInline {B} at (0,0) size 43x26 @@ -57,15 +55,15 @@ layer at (0,0) size 800x600 text run at (138,0) width 43: "four" 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,206) 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 31x19 RenderText {#text} at (85,2) size 31x19 text run at (85,2) width 31: " four" - RenderText {#text} at (116,2) size 26x19 - text run at (116,2) width 26: " one" + RenderText {#text} at (116,2) size 22x19 + text run at (116,2) width 22: "one" RenderBlock (anonymous) at (0,24) size 784x0 RenderText {#text} at (0,0) size 0x0 -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 +caret: position 3 of child 2 {#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/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt index 5e6f64c..e5ed3a5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt @@ -2,7 +2,7 @@ Attributes that are exposed in the CSS computed style object: background-attachment: scroll; background-clip: border-box; -background-color: rgba(0, 0, 0, 0); +background-color: transparent; background-image: none; background-origin: padding-box; background-position: 0% 0%; diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt index 936b19e..0a63dac 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt @@ -47,6 +47,7 @@ cancelBubble : 'false' cancelable : 'true' clipboardData : 'undefined' currentTarget : '[object XMLHttpRequest]' +defaultPrevented : 'false' eventPhase : '2' initEvent : 'function initEvent() { [native code] }' initProgressEvent : 'function initProgressEvent() { [native code] }' @@ -56,6 +57,7 @@ position : '0' preventDefault : 'function preventDefault() { [native code] }' returnValue : 'true' srcElement : '[object XMLHttpRequest]' +stopImmediatePropagation : 'function stopImmediatePropagation() { [native code] }' stopPropagation : 'function stopPropagation() { [native code] }' target : '[object XMLHttpRequest]' total : '0' diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt index 50dec2b..723f17c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt @@ -2,7 +2,7 @@ rect: style.getPropertyValue(background-attachment) : scroll rect: style.getPropertyCSSValue(background-attachment) : [object CSSPrimitiveValue] rect: style.getPropertyValue(background-clip) : border-box rect: style.getPropertyCSSValue(background-clip) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(background-color) : rgba(0, 0, 0, 0) +rect: style.getPropertyValue(background-color) : transparent rect: style.getPropertyCSSValue(background-color) : [object CSSPrimitiveValue] rect: style.getPropertyValue(background-image) : none rect: style.getPropertyCSSValue(background-image) : [object CSSPrimitiveValue] @@ -416,7 +416,7 @@ g: style.getPropertyValue(background-attachment) : scroll g: style.getPropertyCSSValue(background-attachment) : [object CSSPrimitiveValue] g: style.getPropertyValue(background-clip) : border-box g: style.getPropertyCSSValue(background-clip) : [object CSSPrimitiveValue] -g: style.getPropertyValue(background-color) : rgba(0, 0, 0, 0) +g: style.getPropertyValue(background-color) : transparent g: style.getPropertyCSSValue(background-color) : [object CSSPrimitiveValue] g: style.getPropertyValue(background-image) : none g: style.getPropertyCSSValue(background-image) : [object CSSPrimitiveValue] |