diff options
3 files changed, 5 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt index bb3723e..5ed2713 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt @@ -1,9 +1,9 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index c4f1300..2a8a7e3 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -316,6 +316,7 @@ DEFER WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = PASS FAIL LINUX : chrome/fast/forms/basic-textareas.html = FAIL LINUX : chrome/fast/forms/basic-textareas-quirks.html = FAIL LINUX MAC : LayoutTests/editing/selection/5354455-1.html = FAIL +LINUX : LayoutTests/editing/selection/select-all-iframe.html = FAIL LINUX : LayoutTests/editing/selection/select-missing-image.html = FAIL LINUX : LayoutTests/fast/events/offsetX-offsetY.html = FAIL LINUX : LayoutTests/fast/lists/list-marker-with-line-height.html = FAIL @@ -1798,11 +1799,9 @@ LayoutTests/svg/custom/pointer-events-path.svg = FAIL WIN MAC : LayoutTests/svg/custom/pointer-events-text.svg = FAIL // New tests from merge 41181:41217 -LayoutTests/fast/dom/getBoundingClientRect-getClientRects-relative-to-viewport.html = FAIL +DEFER : LayoutTests/fast/dom/getBoundingClientRect-getClientRects-relative-to-viewport.html = FAIL // Regressions from merge 41181:41217 -// New baseline upstream -LINUX WIN : LayoutTests/editing/selection/select-all-iframe.html = FAIL WIN : LayoutTests/fast/lists/drag-into-marker.html = FAIL LINUX WIN : LayoutTests/fast/overflow/004.html = FAIL LINUX WIN : LayoutTests/fast/overflow/hidden-scrollbar-resize.html = FAIL diff --git a/webkit/tools/layout_tests/test_types/test_type_base.py b/webkit/tools/layout_tests/test_types/test_type_base.py index 0c92cbf..4d6fdb7 100644 --- a/webkit/tools/layout_tests/test_types/test_type_base.py +++ b/webkit/tools/layout_tests/test_types/test_type_base.py @@ -182,7 +182,7 @@ class TestTypeBase(object): cmd = [executable, '--start-delete=##WDIFF_DEL##', '--end-delete=##WDIFF_END##', '--start-insert=##WDIFF_ADD##', '--end-insert=##WDIFF_END##', - actual_filename, expected_filename] + expected_filename, actual_filename] filename = self.OutputFilename(filename, test_type + self.FILENAME_SUFFIX_WDIFF) |