Reverting 11396.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8_proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 
@@ skipping 11 matching lines @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "googleurl/src/url_util.h"
 #include "grit/webkit_strings.h"
 #include "net/base/mime_util.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_filter.h"
-#include "skia/ext/platform_device.h"
+#include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/screen_info.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/weburlrequest.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/webwidget.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
@@ skipping 177 matching lines @@
         DumpBackForwardList(&bfDump);
         printf("%s", WideToUTF8(bfDump).c_str());
       }
     }
 
     if (params->dump_pixels && !should_dump_as_text) {
       // Image output: we write the image data to the file given on the
       // command line (for the dump pixels argument), and the MD5 sum to
       // stdout.
       dumped_anything = true;
-      std::string md5sum = DumpImage(shell->webViewHost(),
-                                     params->pixel_file_name);
+      std::string md5sum = DumpImage(webFrame, params->pixel_file_name);
       printf("#MD5:%s\n", md5sum.c_str());
     }
     if (dumped_anything)
       printf("#EOF\n");
     fflush(stdout);
   }
 }
 
 // static
-std::string TestShell::DumpImage(WebViewHost* web_view_host,
+std::string TestShell::DumpImage(WebFrame* web_frame,
     const std::wstring& file_name) {
-  web_view_host->Paint();
-  skia::PlatformDevice& device =
-      web_view_host->canvas()->getTopPlatformDevice();
+  scoped_ptr<skia::BitmapPlatformDevice> device;
+  if (!web_frame->CaptureImage(&device, true))
+    return std::string();
 
-#if defined(OS_WIN)
-  // Make a copy, since we will have to fix the opacity.
-  const SkBitmap& orig = device.accessBitmap(false);
-  SkBitmap src_bmp;
-  orig.copyTo(&src_bmp, orig.config());
-#else
-  const SkBitmap& src_bmp = device.accessBitmap(false);
-#endif
+  const SkBitmap& src_bmp = device->accessBitmap(false);
 
   // Encode image.
   std::vector<unsigned char> png;
   SkAutoLockPixels src_bmp_lock(src_bmp);
   PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_BGRA;
 
   // Fix the alpha. The expected PNGs on Mac have an alpha channel, so we want
   // to keep it. On Windows, the alpha channel is wrong since text/form control
   // drawing may have erased it in a few places. So on Windows we force it to
   // opaque and also don't write the alpha channel for the reference. Linux
   // doesn't have the wrong alpha like Windows, but we ignore it anyway.
 #if defined(OS_WIN)
   bool discard_transparency = true;
-  // TODO(eroman): Clean this up. This used to be device.makeOpaque(), but I
-  // inlined it when resolving conflicts.
-  uint32_t* data = static_cast<uint32_t*> (src_bmp.getPixels());
-  for (int i = 0; i < src_bmp.width() * src_bmp.height(); ++i) {
-    *(data + i) |= (0xFF << SK_A32_SHIFT);
-  }
+  device->makeOpaque(0, 0, src_bmp.width(), src_bmp.height());
 #elif defined(OS_LINUX)
   bool discard_transparency = true;
 #elif defined(OS_MACOSX)
   bool discard_transparency = false;
 #endif
   PNGEncoder::Encode(
       reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
       color_format, src_bmp.width(), src_bmp.height(),
       static_cast<int>(src_bmp.rowBytes()), discard_transparency, &png);
 
@@ skipping 331 matching lines @@
 
 bool IsDefaultPluginEnabled() {
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
 }  // namespace webkit_glue