summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 23:57:05 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 23:57:05 +0000
commit7a176b8a3e342f4bba7ceda6502bc2a3ce51fd6f (patch)
treeb4f6480e1688b37e35f64af0c8558cd34a0f51ed /webkit
parentb05027f84ed2125418ef81e19f2e8083e6da4290 (diff)
downloadchromium_src-7a176b8a3e342f4bba7ceda6502bc2a3ce51fd6f.zip
chromium_src-7a176b8a3e342f4bba7ceda6502bc2a3ce51fd6f.tar.gz
chromium_src-7a176b8a3e342f4bba7ceda6502bc2a3ce51fd6f.tar.bz2
Rebaseline 2 tests that are new from the merge.
These are testing the opacity values of iframes. E.g., the first test loads a lime green background (#00ff00). Over the background, it loads a black iframe with 50% opacity. With skia, we end up with a green color of (#008000). The upstream expected result has a different green (#0e6c00) with an embedded color profile. When I load the png in the gime and appy the color profile, I get (#007c00). I think the difference is just the color profile and that skia is doing the right thing. BUG=11933 Review URL: http://codereview.chromium.org/115386 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.checksum1
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.pngbin0 -> 2917 bytes
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.checksum1
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.pngbin0 -> 2916 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
5 files changed, 2 insertions, 3 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.checksum
new file mode 100755
index 0000000..d244873
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.checksum
@@ -0,0 +1 @@
+9c3eb5720ef266ef9386ef8b8f93122d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.png
new file mode 100755
index 0000000..56a3e87
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-1-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.checksum
new file mode 100755
index 0000000..6e5f69b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.checksum
@@ -0,0 +1 @@
+fb76e4695d476c384c7ba2b3ec126aa9 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.png
new file mode 100755
index 0000000..fed106c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/content-opacity-2-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 35a3815..baa3127 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2713,9 +2713,6 @@ BUG11909 : LayoutTests/http/tests/navigation/new-window-redirect-history.html =
BUG11924 WIN : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL
-BUG11933 WIN LINUX : LayoutTests/fast/frames/content-opacity-1.html = FAIL
-BUG11933 WIN LINUX : LayoutTests/fast/frames/content-opacity-2.html = FAIL
-
// Note: This was already failing in a different way. See BUG10316, above, so be
// sure to uncomment/recheck that when this is removed.
BUG11935 MAC : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = CRASH