Add pixel layout test support for Linux

Tracking down this error turned out to be a total pain. Image dumping is
the first bit of code that we have run into on Linux that copies bitmap
platform devices. Previously we didn't reference count them like Windows
does.

Review URL: http://codereview.chromium.org/11459


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5657 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 33 insertions, 83 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index cd3c2d7..551d14c 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -9,8 +9,10 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/gfx/bitmap_platform_device.h"
+#include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
+#include "base/md5.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stats_table.h"
@@ -148,6 +150,37 @@ static void UnitTestAssertHandler(const std::string& str) {
 }
 
 // static
+std::string TestShell::DumpImage(WebFrame* web_frame,
+    const std::wstring& file_name) {
+  scoped_ptr<gfx::BitmapPlatformDevice> device;
+  if (!web_frame->CaptureImage(&device, true))
+    return std::string();
+
+  const SkBitmap& src_bmp = device->accessBitmap(false);
+
+  // Encode image.
+  std::vector<unsigned char> png;
+  SkAutoLockPixels src_bmp_lock(src_bmp);
+  PNGEncoder::Encode(
+      reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
+      PNGEncoder::FORMAT_BGRA, src_bmp.width(), src_bmp.height(),
+      static_cast<int>(src_bmp.rowBytes()), true, &png);
+
+  // Write to disk.
+  file_util::WriteFile(file_name, reinterpret_cast<const char *>(&png[0]),
+                       png.size());
+
+  // Compute MD5 sum.
+  MD5Context ctx;
+  MD5Init(&ctx);
+  MD5Update(&ctx, src_bmp.getPixels(), src_bmp.getSize());
+
+  MD5Digest digest;
+  MD5Final(&digest, &ctx);
+  return MD5DigestToBase16(digest);
+}
+
+// static
 void TestShell::InitLogging(bool suppress_error_dialogs,
                             bool running_layout_tests) {
     if (suppress_error_dialogs)
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index f11b357..67d25c1 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -284,15 +284,6 @@ void TestShell::ResizeSubViews() {
   // GTK manages layout for us so we do nothing.
 }
 
-/* static */ std::string TestShell::DumpImage(
-        WebFrame* web_frame,
-        const std::wstring& file_name) {
-  // Windows uses some platform specific bitmap functions here.
-  // TODO(agl): port
-  NOTIMPLEMENTED();
-  return "00000000000000000000000000000000";
-}
-
 /* static */ void TestShell::DumpBackForwardList(std::wstring* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 4d38664..f4a14c9d2 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -12,10 +12,8 @@
 #include "base/debug_util.h"
 #include "base/file_util.h"
 #include "base/gfx/bitmap_platform_device.h"
-#include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
-#include "base/md5.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -397,42 +395,6 @@ void TestShell::ResizeSubViews() {
   // handled by Cocoa for us
 }
 
-/* static */ std::string TestShell::DumpImage(
-        WebFrame* web_frame,
-        const std::wstring& file_name) {
-  scoped_ptr<gfx::BitmapPlatformDevice> device;
-  if (!web_frame->CaptureImage(&device, true))
-    return std::string();
-
-  const SkBitmap& src_bmp = device->accessBitmap(false);
-
-  // Encode image.
-  std::vector<unsigned char> png;
-  SkAutoLockPixels src_bmp_lock(src_bmp); 
-  PNGEncoder::Encode(
-      reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
-      PNGEncoder::FORMAT_RGBA, src_bmp.width(), src_bmp.height(),
-      static_cast<int>(src_bmp.rowBytes()), true, &png);
-  
-  // Write to disk.
-  if (png.size() > 0) {
-    FILE* file = fopen(WideToUTF8(file_name).c_str(), "w");
-    if (file) {
-      fwrite(&png[0], sizeof(unsigned char), png.size(), file);
-      fclose(file);
-    }
-  }
-  
-  // Compute MD5 sum.
-  MD5Context ctx;
-  MD5Init(&ctx);
-  MD5Update(&ctx, src_bmp.getPixels(), src_bmp.getSize());
-  
-  MD5Digest digest;
-  MD5Final(&digest, &ctx);
-  return MD5DigestToBase16(digest);
-}
-
 /* static */ void TestShell::DumpBackForwardList(std::wstring* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index eb52dc9..12c2c47 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -12,8 +12,6 @@
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/gfx/bitmap_platform_device.h"
-#include "base/gfx/png_encoder.h"
-#include "base/md5.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -113,40 +111,6 @@ ATOM TestShell::RegisterWindowClass() {
   return RegisterClassEx(&wcex);
 }
 
-// static
-std::string TestShell::DumpImage(WebFrame* web_frame,
-    const std::wstring& file_name) {
-  scoped_ptr<gfx::BitmapPlatformDevice> device;
-  if (!web_frame->CaptureImage(&device, true))
-    return std::string();
-
-  const SkBitmap& src_bmp = device->accessBitmap(false);
-
-  // Encode image.
-  std::vector<unsigned char> png;
-  SkAutoLockPixels src_bmp_lock(src_bmp); 
-  PNGEncoder::Encode(
-      reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
-      PNGEncoder::FORMAT_BGRA, src_bmp.width(), src_bmp.height(),
-      static_cast<int>(src_bmp.rowBytes()), true, &png);
-
-  // Write to disk.
-  FILE* file = NULL;
-  if (_wfopen_s(&file, file_name.c_str(), L"wb") == 0) {
-    fwrite(&png[0], 1, png.size(), file);
-    fclose(file);
-  }
-
-  // Compute MD5 sum.
-  MD5Context ctx;
-  MD5Init(&ctx);
-  MD5Update(&ctx, src_bmp.getPixels(), src_bmp.getSize());
-
-  MD5Digest digest;
-  MD5Final(&digest, &ctx);
-  return MD5DigestToBase16(digest);
-}
-
 void TestShell::DumpBackForwardList(std::wstring* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();