summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 18:19:45 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 18:19:45 +0000
commit0f4899dc496e611d72f9171e29918c3b464b5147 (patch)
tree9fb90d277233fce1c2e729dc1c3bc165604d1720
parentde1a9023b5c2e6ed256b4cf874c234aebbc16928 (diff)
downloadchromium_src-0f4899dc496e611d72f9171e29918c3b464b5147.zip
chromium_src-0f4899dc496e611d72f9171e29918c3b464b5147.tar.gz
chromium_src-0f4899dc496e611d72f9171e29918c3b464b5147.tar.bz2
Have Linux checksums depend on WebKit::areLayoutTestImagesOpaque
This makes it possible for us to flip this flag and rebaseline the linux tests in a single commit. BUG=21386 Review URL: http://codereview.chromium.org/3348013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58854 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index c33856ca..765f15b 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -367,6 +367,8 @@ std::string TestShell::DumpImage(skia::PlatformCanvas* canvas,
bool discard_transparency = false;
#elif defined(OS_POSIX)
bool discard_transparency = true;
+ if (WebKit::areLayoutTestImagesOpaque())
+ device.makeOpaque(0, 0, src_bmp.width(), src_bmp.height());
#endif
// Compute MD5 sum. We should have done this before calling