summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.pngbin4112 -> 4109 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
3 files changed, 2 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.checksum
index f79f2ef..62ed54d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.checksum
@@ -1 +1 @@
-8353f195124713f76ab0d6e49a0a1fe7 \ No newline at end of file
+c73c11b5c749ab7a924bcb9cbda494f5 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.png
index 87ad954..ed5c6a6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/paste-1-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 314836d..a399d13 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2476,10 +2476,6 @@ BUG9798 LINUX RELEASE : chrome/fast/dom/extensions/interval.html = FAIL PASS
BUG9798 MAC DEBUG : chrome/fast/dom/extensions/interval.html = FAIL PASS
BUG9798 WIN : chrome/fast/dom/extensions/interval.html = FAIL PASS
BUG9798 LINUX RELEASE : LayoutTests/editing/execCommand/15381.html = FAIL PASS
-
-// Was flaky. Became a consistent failure.
-BUG9798 WIN : LayoutTests/editing/execCommand/paste-1.html = FAIL
-
BUG9798 WIN : LayoutTests/editing/execCommand/paste-2.html = FAIL PASS
BUG9798 WIN LINUX MAC : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL PASS
@@ -3056,7 +3052,7 @@ BUG24331 LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL PASS
BUG_JORLOW : LayoutTests/storage/domstorage/sessionstorage/complex-values.html = FAIL
// WebKit update: 49190:49206
-BUG_JPARENT MAC LINUX : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
+BUG_JPARENT MAC WIN DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
BUG_JPARENT MAC DEBUG : LayoutTests/editing/execCommand/paste-2.html = FAIL PASS
BUG_JPARENT WIN DEBUG : LayoutTests/fast/frames/calculate-percentage.html = CRASH PASS
BUG_JPARENT WIN DEBUG : LayoutTests/fast/frames/calculate-fixed.html = CRASH PASS