diff options
6 files changed, 7 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-1-expected.checksum new file mode 100644 index 0000000..e4b8c66 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-1-expected.checksum @@ -0,0 +1 @@ +cd8744d82d20e2f8cd3129c8bed73510
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-1-expected.png Binary files differnew file mode 100644 index 0000000..56a3e87 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-2-expected.checksum new file mode 100644 index 0000000..90c3d99 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-2-expected.checksum @@ -0,0 +1 @@ +e17213872712ebbd85643d53459da175
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-2-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-2-expected.png Binary files differnew file mode 100644 index 0000000..fed106c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/frames/content-opacity-2-expected.png diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index bfce5da..b0fbaa0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2652,9 +2652,6 @@ BUG11909 : LayoutTests/http/tests/security/aboutBlank/security-context-grandchil BUG11924 WIN : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL -BUG11933 LINUX : LayoutTests/fast/frames/content-opacity-1.html = FAIL -BUG11933 LINUX : LayoutTests/fast/frames/content-opacity-2.html = FAIL - // Need LINUX/Mac rebaselines after WebKit Update 437150:43770 BUG12054 MAC LINUX : LayoutTests/fast/canvas/canvas-bg-zoom.html = FAIL BUG12054 MAC LINUX : LayoutTests/editing/execCommand/outdent-blockquote-test1.html = FAIL diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index bb609ca..085537e 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -265,7 +265,11 @@ std::string TestShell::DumpImage(WebFrame* web_frame, bool discard_transparency = false; #endif - // Compute MD5 sum. + // Compute MD5 sum. We should have done this before calling + // device->makeOpaque on Windows. Because we do it after the call, there are + // some images that are the pixel identical on windows and other platforms + // but have different MD5 sums. At this point, rebaselining all the windows + // tests is too much of a pain, so we just check in different baselines. MD5Context ctx; MD5Init(&ctx); MD5Update(&ctx, src_bmp.getPixels(), src_bmp.getSize()); |
