diff options
16 files changed, 41 insertions, 42 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.txt index b1ab7a3..2258710 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.txt @@ -49,6 +49,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,290) size 784x32 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] RenderBlock {DIV} at (42,2) size 740x28 - RenderText {#text} at (-40,0) size 40x27 + RenderText {#text} at (-40,0) size 32x27 text run at (-40,0) width 32: "foo" caret: position 3 of child 0 {#text} of child 1 {DIV} 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/backgrounds/svg-as-background-3-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/svg-as-background-3-expected.checksum deleted file mode 100644 index 8b2b8fe..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/svg-as-background-3-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -5124e862f88ad61cedd150a0efe1d2c9
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/svg-as-background-3-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/svg-as-background-3-expected.png Binary files differdeleted file mode 100644 index e4ea19d..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/svg-as-background-3-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.checksum index b7deb2e..ec6458b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.checksum @@ -1 +1 @@ -612adc54e3951ffd56edb0f5c787cb6d
\ No newline at end of file +549a0e3c4ddc270e1cf021faa18a6298
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.png Binary files differindex 1458252..30fceb6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/invalid-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.checksum index c9806b2..cb86fe1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.checksum @@ -1 +1 @@ -0513ed53a0945af3ef1524ef057a522c
\ No newline at end of file +1b31ffb99a5dc5428377796fa89ef752
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.png Binary files differindex f82683d..cbac457 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/onlyCommentInIFrame-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.checksum index b7deb2e..ec6458b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.checksum @@ -1 +1 @@ -612adc54e3951ffd56edb0f5c787cb6d
\ No newline at end of file +549a0e3c4ddc270e1cf021faa18a6298
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.png Binary files differindex 1458252..30fceb6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/valid-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.checksum index c996d2a..7f4edf2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.checksum @@ -1 +1 @@ -a8673ed121851eb31093e1e7ffb7a20c
\ No newline at end of file +ac76f56e070a04fc5739404c1ebded09
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.png Binary files differindex eebbf03..a896bc2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.txt index 44e6e03..d92f01e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-x-y-expected.txt @@ -6,9 +6,9 @@ layer at (0,0) size 785x600 RenderBlock (anonymous) at (0,0) size 769x20 RenderText {#text} at (0,0) size 296x19 text run at (0,0) width 296: "The body should always have a vertical scrollbar." - RenderBlock (anonymous) at (0,220) size 769x54 - RenderText {#text} at (159,34) size 4x19 - text run at (159,34) width 4: " " + RenderBlock (anonymous) at (0,220) size 769x58 + RenderText {#text} at (179,38) size 4x19 + text run at (179,38) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,28) size 300x100 clip at (8,28) size 285x100 scrollHeight 359 RenderBlock {DIV} at (0,20) size 300x100 @@ -72,13 +72,13 @@ layer at (8,128) size 300x100 clip at (8,128) size 300x85 scrollWidth 1118 text run at (0,0) width 459: "X scroll X scroll X scroll X scroll X scroll X scroll X scroll X scroll X scroll " text run at (459,0) width 306: "X scroll X scroll X scroll X scroll X scroll X scroll " text run at (765,0) width 353: "X scroll X scroll X scroll X scroll X scroll X scroll X scroll" -layer at (8,244) size 159x32 clip at (9,245) size 142x30 - RenderTextControl {TEXTAREA} at (0,16) size 159x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] - RenderBlock {DIV} at (3,3) size 138x14 - RenderText {#text} at (0,0) size 119x14 - text run at (0,0) width 119: "Textarea y-scroll" -layer at (171,229) size 159x47 clip at (172,230) size 157x30 - RenderTextControl {TEXTAREA} at (163,1) size 159x47 [bgcolor=#FFFFFF] [border: (1px solid #000000)] - RenderBlock {DIV} at (3,3) size 138x14 - RenderText {#text} at (0,0) size 119x14 - text run at (0,0) width 119: "Textarea x-scroll" +layer at (8,244) size 179x36 clip at (9,245) size 162x34 + RenderTextControl {TEXTAREA} at (0,16) size 179x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock {DIV} at (3,3) size 158x16 + RenderText {#text} at (0,0) size 136x16 + text run at (0,0) width 136: "Textarea y-scroll" +layer at (191,229) size 179x51 clip at (192,230) size 177x34 + RenderTextControl {TEXTAREA} at (183,1) size 179x51 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock {DIV} at (3,3) size 158x16 + RenderText {#text} at (0,0) size 136x16 + text run at (0,0) width 136: "Textarea x-scroll" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.checksum index b6ec20d..e4796d5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.checksum @@ -1 +1 @@ -3633dd105511799dbb7a8716633f9324
\ No newline at end of file +669636ecf0259888d95aa5c82dfc079c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.png Binary files differindex d23b952..c8accf4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.txt index 32163a6..137f701 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/comment-in-textarea-expected.txt @@ -6,14 +6,14 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,9) size 159x32 clip at (9,10) size 142x30 scrollHeight 72 - RenderTextControl {TEXTAREA} at (0,1) size 159x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)] - RenderBlock {DIV} at (3,3) size 138x70 - RenderText {#text} at (0,0) size 138x56 - text run at (0,0) width 133: "<!-- </textarea> --" - text run at (0,14) width 7: ">" - text run at (7,14) width 0: " " - text run at (0,28) width 138: "This should be part " - text run at (0,42) width 105: "of the textarea" - text run at (105,42) width 0: " " - RenderBR {BR} at (0,56) size 0x14 +layer at (8,9) size 179x36 clip at (9,10) size 162x34 scrollHeight 82 + RenderTextControl {TEXTAREA} at (0,1) size 179x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock {DIV} at (3,3) size 158x80 + RenderText {#text} at (0,0) size 158x64 + text run at (0,0) width 152: "<!-- </textarea> --" + text run at (0,16) width 8: ">" + text run at (8,16) width 0: " " + text run at (0,32) width 158: "This should be part " + text run at (0,48) width 120: "of the textarea" + text run at (120,48) width 0: " " + RenderBR {BR} at (0,64) size 0x16 diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 06c2f78..37f9bb0 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -319,14 +319,23 @@ DEFER WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = PASS FAIL // These were recently rebaselined on Windows and probably just need a // rebaseline on other platforms as well. +LINUX : LayoutTests/editing/style/smoosh-styles-003.html = FAIL LINUX MAC : chrome/fast/forms/basic-textareas.html = FAIL LINUX MAC : chrome/fast/forms/basic-textareas-quirks.html = FAIL +// For these two fast/frames tests it looks like the win baseline had some weird +// artifacts on the scrollbars on one of the frames, which has now been removed. +// This artifact does not exist on the mac baseline. +LINUX : LayoutTests/fast/frames/invalid.html = FAIL +LINUX : LayoutTests/fast/frames/valid.html = FAIL +LINUX : LayoutTests/fast/frames/onlyCommentInIFrame.html = FAIL // Compact support was removed from WebKit by Hyatt and layout tests rebaselined in r40259. LINUX : LayoutTests/fast/compact/001.html = FAIL LINUX : LayoutTests/fast/compact/002.html = FAIL DEFER LINUX : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL MAC LINUX : LayoutTests/fast/dom/prototype-chain.html = FAIL MAC LINUX : LayoutTests/fast/inline/percentage-margins.html = FAIL +MAC LINUX : LayoutTests/fast/overflow/overflow-x-y.html = FAIL +MAC LINUX : LayoutTests/fast/parser/comment-in-textarea.html = FAIL MAC : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL LINUX : LayoutTests/fast/runin/002.html = FAIL LINUX : LayoutTests/fast/table/form-with-table-style.html = FAIL @@ -606,8 +615,8 @@ WIN : LayoutTests/svg/custom/container-opacity-clip-viewBox.svg = FAIL // The pattern we generate is wrong. LINUX WIN : LayoutTests/svg/custom/pattern-cycle-detection.svg = FAIL -// Background SVGs fail upstream but were rebaselined to pass (r38335) -// https://bugs.webkit.org/show_bug.cgi?id=21910 +// Fixed upstream, see https://bugs.webkit.org/show_bug.cgi?id=21910. +// However, we don't seem to draw the "eyeballs" at the correct location. LINUX WIN : LayoutTests/fast/backgrounds/svg-as-background-3.html = FAIL // @@ -986,15 +995,7 @@ LINUX WIN : LayoutTests/fast/forms/listbox-selection-2.html = FAIL LINUX WIN : LayoutTests/fast/forms/select-item-background-clip.html = FAIL // The pixel diff looks ok, but the render trees are pretty different. LayoutTests/fast/forms/textarea-rows-cols.html = FAIL -// Linux pixeltest failure: Small scrollbar error -LINUX WIN : LayoutTests/fast/frames/invalid.html = FAIL -// Linux pixeltest failure: Looks like we're screwing up the scollbar -LINUX WIN : LayoutTests/fast/frames/onlyCommentInIFrame.html = FAIL -// Linux pixeltest failure: Looks like we're screwing up the scollbar -LINUX WIN : LayoutTests/fast/frames/valid.html = FAIL LayoutTests/fast/invalid/residual-style.html = FAIL -LayoutTests/fast/overflow/overflow-x-y.html = FAIL -LayoutTests/fast/parser/comment-in-textarea.html = FAIL // Linux pixeltest failure: We, with Windows, are failing to repaint correctly LINUX WIN : LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL WIN : LayoutTests/fast/repaint/overflow-scroll-delete.html = FAIL @@ -1677,7 +1678,6 @@ LINUX : LayoutTests/svg/custom/gradient-stop-style-change.svg = FAIL PASS WIN LINUX : LayoutTests/fast/table/vertical-align-baseline.html = FAIL // Merge 40165:40297 -- regressions -LINUX WIN : LayoutTests/editing/style/smoosh-styles-003.html = FAIL LayoutTests/fast/forms/textarea-no-scroll-on-blur.html = FAIL LINUX WIN : LayoutTests/fast/loader/null-request-after-willSendRequest.html = FAIL TIMEOUT MAC : LayoutTests/fast/loader/null-request-after-willSendRequest.html = FAIL TIMEOUT |
