summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.pngbin10555 -> 10547 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt13
3 files changed, 1 insertions, 14 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.checksum
index 33c0a8e..0a22575 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.checksum
@@ -1 +1 @@
-0a1b38474fda6f97f4ce4d0c176f2493 \ No newline at end of file
+cffd0cc6a9a1a478ff9d8c930e185d5d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.png
index c448006..1d48f29 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5387578-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 67beace..d6d6209 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2472,16 +2472,3 @@ BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.h
DEFER BUG10621 : LayoutTests/fast/js/array-reduce.html = FAIL
DEFER BUG10621 : LayoutTests/fast/js/array-reduceRight.html = FAIL
DEFER BUG10622 : LayoutTests/fast/js/array-enumerators-functions.html = FAIL
-
-// New regressions from webkit merge 42547:42580
-// These need to be rebaselined on linux. Caused by
-// http://trac.webkit.org/changeset/42549
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/4076267-2.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/4840662.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/5156401-1.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/5387578.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/bad-placeholder.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/paste-into-anchor-text.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/paste-match-style-001.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/paste-text-019.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/selection/drag-text-delay.html = FAIL