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/selection/drag-in-iframe-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.pngbin5227 -> 5190 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.pngbin0 -> 12601 bytes
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt7
5 files changed, 2 insertions, 8 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.checksum
index 992f53f..d7357ad 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.checksum
@@ -1 +1 @@
-96ef590d89b4721b1cf1f0222dc4b80c \ No newline at end of file
+8d7d5760a56731f2bc05e059f97cb1f0 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.png
index 35a4461..67f5631 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/drag-in-iframe-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.checksum
new file mode 100644
index 0000000..96931c3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.checksum
@@ -0,0 +1 @@
+7c6c4223fdb2b156fe8bc365209f1f37 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.png
new file mode 100644
index 0000000..8bd88db
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/no_transform_hit_testing-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index fc4e769..f875809 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -185,9 +185,6 @@ DEFER : LayoutTests/fast/encoding/idn-security.html = FAIL
DEFER : LayoutTests/fast/history/clicked-link-is-visited.html = FAIL
DEFER : LayoutTests/fast/history/subframe-is-visited.html = FAIL
-// Probably needs to be rebaselined on MAC and LINUX
-DEFER LINUX : LayoutTests/editing/selection/drag-in-iframe.html = FAIL TIMEOUT
-
// Bug 849056
// We don't support NPN_Enumerate, but don't know of any plugin
// which depends on that functionality. So we ignore this for beta.
@@ -709,10 +706,6 @@ LayoutTests/fast/block/float/t0905-c5526-flthw-00-c-g.html = FAIL
// URLs. http://crbug.com/8407
DEFER : LayoutTests/fast/loader/main-document-url-for-non-http-loads.html = FAIL
-// New test addded in the 41286:41362 merge. http://crbug.com/8439 for further
-// investigation.
-DEFER LINUX : LayoutTests/transforms/no_transform_hit_testing.html = FAIL
-
// Crashing intermittently since a v8 update. http://crbug.com/8442
LINUX : LayoutTests/fast/clip/nestedTransparencyClip.html = CRASH PASS