diff options
6 files changed, 30 insertions, 37 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-026-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-026-expected.txt index a95c116..eb997e0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-026-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-026-expected.txt @@ -52,10 +52,9 @@ layer at (0,0) size 800x600 text run at (455,27) width 12: "x" RenderBlock {DIV} at (0,234) size 784x32 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - RenderInline {B} at (0,0) size 31x26 + RenderInline {B} at (0,0) size 19x26 RenderText {#text} at (2,2) size 19x26 text run at (2,2) width 19: "fo" - RenderInline {SPAN} at (0,0) size 12x27 - RenderText {#text} at (21,2) size 12x27 - text run at (21,2) width 12: "x" + RenderText {#text} at (21,2) size 12x27 + text run at (21,2) width 12: "x" caret: position 3 of child 0 {#text} of child 0 {B} 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/paste-text-at-tabspan-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-001-expected.txt index caf1613..9c42493 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-001-expected.txt @@ -4,10 +4,10 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -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: 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 > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -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 2 of #text > SPAN > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document to 2 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -19,12 +19,13 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 154x27 RenderText {#text} at (14,14) size 11x27 text run at (14,14) width 11: "a" - RenderText {#text} at (25,14) size 23x27 - text run at (25,14) width 23: "ax" - RenderInline {SPAN} at (0,0) size 110x27 + RenderInline {SPAN} at (0,0) size 133x27 + RenderInline {SPAN} at (0,0) size 23x27 + RenderText {#text} at (25,14) size 23x27 + text run at (25,14) width 23: "ax" RenderText {#text} at (48,14) size 110x27 text run at (48,14) width 110: "\x{9}\x{9}\x{9}" RenderText {#text} at (158,14) size 10x27 text run at (158,14) width 10: "z" RenderText {#text} at (0,0) size 0x0 -caret: position 2 of child 1 {#text} of child 1 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 2 of child 0 {#text} of child 0 {SPAN} of child 1 {SPAN} of child 1 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-002-expected.txt index e4a2af8..2567998 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-002-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-at-tabspan-002-expected.txt @@ -5,10 +5,10 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > 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: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -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 2 of #text > SPAN > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document to 2 of #text > SPAN > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -23,12 +23,13 @@ layer at (0,0) size 800x600 RenderInline {SPAN} at (0,0) size 37x27 RenderText {#text} at (25,14) size 37x27 text run at (25,14) width 37: "\x{9}" - RenderText {#text} at (62,14) size 23x27 - text run at (62,14) width 23: "ax" - RenderInline {SPAN} at (0,0) size 73x27 + RenderInline {SPAN} at (0,0) size 96x27 + RenderInline {SPAN} at (0,0) size 23x27 + RenderText {#text} at (62,14) size 23x27 + text run at (62,14) width 23: "ax" RenderText {#text} at (85,14) size 73x27 text run at (85,14) width 73: "\x{9}\x{9}" RenderText {#text} at (158,14) size 10x27 text run at (158,14) width 10: "z" RenderText {#text} at (0,0) size 0x0 -caret: position 2 of child 2 {#text} of child 1 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 2 of child 0 {#text} of child 0 {SPAN} of child 2 {SPAN} of child 1 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt index 3893142..9016aad 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt @@ -3,13 +3,12 @@ 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 - RenderInline {U} at (0,0) size 468x15 + RenderInline {U} at (0,0) size 234x15 RenderText {#text} at (0,0) size 234x15 text run at (0,0) width 234: "This text should be Times New Roman bold." - RenderInline {SPAN} at (0,0) size 234x15 - RenderInline {U} at (0,0) size 234x15 - RenderText {#text} at (234,0) size 234x15 - text run at (234,0) width 234: "This text should be Times New Roman bold." + RenderInline {U} at (0,0) size 234x15 + RenderText {#text} at (234,0) size 234x15 + text run at (234,0) width 234: "This text should be Times New Roman bold." RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -caret: position 41 of child 0 {#text} of child 0 {U} of child 1 {SPAN} of child 0 {U} of child 1 {BODY} of child 0 {HTML} of document +caret: position 41 of child 0 {#text} of child 1 {U} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-001-expected.txt index e1eabab..80a6b3b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-001-expected.txt @@ -18,7 +18,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 2 of #text > SPAN > DIV > DIV > BODY > HTML > #document to 2 of #text > SPAN > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > SPAN > SPAN > DIV > DIV > BODY > HTML > #document to 3 of #text > SPAN > SPAN > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +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 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -51,14 +51,13 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,206) size 784x32 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 76x27 [color=#FF0000] + RenderInline {SPAN} at (0,0) size 23x27 [color=#FF0000] RenderText {#text} at (2,2) size 23x27 text run at (2,2) width 23: "ab" - RenderInline {SPAN} at (0,0) size 53x27 [color=#000000] - RenderText {#text} at (25,2) size 34x27 - text run at (25,2) width 34: "cde" - RenderInline {SPAN} at (0,0) size 19x27 [color=#FF0000] - RenderText {#text} at (59,2) size 19x27 - text run at (59,2) width 19: "fg" + RenderText {#text} at (25,2) size 34x27 + text run at (25,2) width 34: "cde" + RenderInline {SPAN} at (0,0) size 19x27 [color=#FF0000] + RenderText {#text} at (59,2) size 19x27 + text run at (59,2) width 19: "fg" RenderBlock (anonymous) at (0,32) size 784x0 -caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 1 {SPAN} 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/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index f08d356..6540cca 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2776,12 +2776,6 @@ BUG37684 SKIP : http/tests/cookies/third-party-cookie-relaxing.html = FAIL BUG29393 : http/tests/loading/state-object-security-exception.html = TEXT // Bugs that went unreported when we upstreamed run_webkit_tests -BUG37896 WIN LINUX : editing/deleting/delete-3857753-fix.html = TEXT -BUG37896 WIN LINUX : editing/inserting/insert-div-026.html = TEXT -BUG37896 WIN LINUX : editing/pasteboard/paste-text-at-tabspan-001.html = TEXT -BUG37896 WIN LINUX : editing/pasteboard/paste-text-at-tabspan-002.html = TEXT -BUG37896 WIN LINUX : editing/style/font-family-with-space.html = TEXT -BUG37896 WIN LINUX : editing/style/smoosh-styles-001.html = TEXT BUG37896 WIN : editing/undo/undo-smart-delete-word.html = TEXT BUG37896 MAC LINUX : fast/backgrounds/animated-svg-as-background.html = IMAGE BUG37896 MAC LINUX : fast/dom/Window/window-appendages-cleared.html = TEXT |