diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-subframeload-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-subframeload-expected.txt index 97bb918..7ea6f00 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-subframeload-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-subframeload-expected.txt @@ -106,7 +106,8 @@ layer at (0,0) size 800x600 RenderTextControl {TEXTAREA} at (0,287) size 259x164 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 238x48 RenderText {#text} at (0,0) size 238x32 - text run at (0,0) width 238: "More initial text before user " + text run at (0,0) width 232: "More initial text before user" + text run at (232,0) width 6: " " text run at (0,16) width 48: "input." text run at (48,16) width 0: " " RenderBR {BR} at (0,32) size 0x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/success200-frames-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/success200-frames-expected.txt index 6c66bd4..9b9ce80 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/success200-frames-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/success200-frames-expected.txt @@ -106,7 +106,8 @@ layer at (0,0) size 800x600 RenderTextControl {TEXTAREA} at (0,287) size 259x164 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 238x48 RenderText {#text} at (0,0) size 238x32 - text run at (0,0) width 238: "More initial text before user " + text run at (0,0) width 232: "More initial text before user" + text run at (232,0) width 6: " " text run at (0,16) width 48: "input." text run at (48,16) width 0: " " RenderBR {BR} at (0,32) 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 f5125cb..a469382 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1582,8 +1582,6 @@ MAC : LayoutTests/fast/events/scrollbar-double-click.html = TIMEOUT PASS // Regressions from WebKit merge 40847-40875 LINUX WIN : LayoutTests/fast/box-shadow/basic-shadows.html = FAIL MAC LINUX WIN : LayoutTests/fast/forms/textarea-scrolled-endline-caret.html = FAIL PASS -WIN : LayoutTests/http/tests/navigation/javascriptlink-subframeload.html = FAIL PASS -WIN : LayoutTests/http/tests/navigation/success200-frames.html = FAIL PASS LINUX : LayoutTests/fast/clip/017.html = CRASH PASS // Unknown reason. |