Implement layoutTestController.display() method....

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2009 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 223 matching lines @@
         DumpAllBackForwardLists(&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->webView(), params->pixel_file_name,
-          params->pixel_hash);
+      WebViewHost* view_host = shell->webViewHost();
+      view_host->webview()->layout();
+      view_host->Paint();
+      std::string md5sum = DumpImage(view_host->canvas(),
+          params->pixel_file_name, params->pixel_hash);
       printf("#MD5:%s\n", md5sum.c_str());
     }
     if (dumped_anything)
       printf("#EOF\n");
     fflush(stdout);
   }
 }
 
 // static
-std::string TestShell::DumpImage(WebView* view,
+std::string TestShell::DumpImage(skia::PlatformCanvas* canvas,
     const std::wstring& file_name, const std::string& pixel_hash) {
-  view->layout();
-  const WebSize& size = view->size();
-
-  skia::PlatformCanvas canvas;
-  if (!canvas.initialize(size.width, size.height, true))
-    return std::string();
-  view->paint(webkit_glue::ToWebCanvas(&canvas),
-              WebRect(0, 0, size.width, size.height));
-
   skia::BitmapPlatformDevice& device =
-      static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
+      static_cast<skia::BitmapPlatformDevice&>(canvas->getTopPlatformDevice());
   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
@@ skipping 397 matching lines @@
 
 void CloseIdleConnections() {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 void SetCacheMode(bool enabled) {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 }  // namespace webkit_glue