Add support for the "repaint" layout tests (LayoutTests/fast/repaint/*), whic...

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 10 matching lines @@
 #include "base/md5.h"
 #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 "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/bitmap_platform_device.h"
+#include "skia/ext/platform_device.h"
 #include "testing/gtest/include/gtest/gtest.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"
 #include "webkit/tools/test_shell/test_navigation_controller.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(webFrame, params->pixel_file_name);
+      std::string md5sum = DumpImage(shell->webViewHost(),
+                                     params->pixel_file_name);
       printf("#MD5:%s\n", md5sum.c_str());
     }
     if (dumped_anything)
       printf("#EOF\n");
     fflush(stdout);
   }
 }
 
 // static
-std::string TestShell::DumpImage(WebFrame* web_frame,
+std::string TestShell::DumpImage(WebViewHost* web_view_host,
     const std::wstring& file_name) {
-  scoped_ptr<skia::BitmapPlatformDevice> device;
-  if (!web_frame->CaptureImage(&device, true))
-    return std::string();
 
-  const SkBitmap& src_bmp = device->accessBitmap(false);
+  web_view_host->Paint();
+  skia::PlatformDevice& device =
+      web_view_host->canvas()->getTopPlatformDevice();
+
+#if defined(OS_WIN)
+  // On windows we need to fixup the alpha on the bitmap. Do the fixup in a
+  // copy of the bitmap so as not to modify the original.
+  SkBitmap src_bmp;
+  const SkBitmap& orig = device.accessBitmap(false);
+  orig.copyTo(&src_bmp, orig.config());
+  skia::BitmapPlatformDeviceWin::fixupAlpha(src_bmp);
+#else
+  const SkBitmap& src_bmp = device.accessBitmap(false);
+#endif
 
   // Encode image.
   std::vector<unsigned char> png;
   SkAutoLockPixels src_bmp_lock(src_bmp);
   PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_BGRA;
 #if defined(OS_WIN) || defined(OS_LINUX)
   bool discard_transparency = true;
 #elif defined(OS_MACOSX)
   // the expected PNGs in webkit have an alpha channel. We shouldn't discard
   // the transparency for reference purposes, though the hashes will still
@@ skipping 366 matching lines @@
 
 uint64 VisitedLinkHash(const char* canonical_url, size_t length) {
   return 0;
 }
 
 bool IsLinkVisited(uint64 link_hash) {
   return false;
 }
 
 }  // namespace webkit_glue