diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 19:20:40 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 19:20:40 +0000 |
| commit | ab844167875b2003cb44081c6b64c0097df30b48 (patch) | |
| tree | 649754e705904449526bc5235c7818d28a655081 | |
| parent | eb8c76326fb39a429dc8bda38da22a86bb6802b3 (diff) | |
| download | chromium_src-ab844167875b2003cb44081c6b64c0097df30b48.zip chromium_src-ab844167875b2003cb44081c6b64c0097df30b48.tar.gz chromium_src-ab844167875b2003cb44081c6b64c0097df30b48.tar.bz2 | |
mac uses RGBA for its rendering, not BGRA. This fix got lost when we merged to cross-platform TestShell code.
Review URL: http://codereview.chromium.org/13788
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6912 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index e661066..87da3bd 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -178,9 +178,15 @@ std::string TestShell::DumpImage(WebFrame* web_frame, // Encode image. std::vector<unsigned char> png; SkAutoLockPixels src_bmp_lock(src_bmp); + PNGEncoder::ColorFormat color_format = +#if defined(OS_WIN) || defined(OS_LINUX) + PNGEncoder::FORMAT_BGRA; +#elif defined(OS_MACOSX) + PNGEncoder::FORMAT_RGBA; +#endif PNGEncoder::Encode( reinterpret_cast<const unsigned char*>(src_bmp.getPixels()), - PNGEncoder::FORMAT_BGRA, src_bmp.width(), src_bmp.height(), + color_format, src_bmp.width(), src_bmp.height(), static_cast<int>(src_bmp.rowBytes()), true, &png); // Write to disk. |