Simplify platform_canvas.h by recognizing that PlatformCanvas does not actually extend

content/shell/webkit_test_runner.cc

 // Copyright (c) 2012 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 "content/shell/webkit_test_runner.h"
 
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 95 matching lines @@
 
   if (recursive) {
     for (WebFrame* child = frame->firstChild(); child;
          child = child->nextSibling()) {
       result.append(DumpFrameScrollPosition(child, recursive));
     }
   }
   return result;
 }
 
-bool PaintViewIntoCanvas(WebView* view, skia::PlatformCanvas& canvas) {
+SkCanvas* PaintViewIntoCanvas(WebView* view) {
   view->layout();
   const WebSize& size = view->size();
 
-  if (!canvas.initialize(size.width, size.height, true))
-    return false;
-
-  view->paint(webkit_glue::ToWebCanvas(&canvas),
-              WebRect(0, 0, size.width, size.height));
-  return true;
+  SkCanvas* canvas = skia::CreatePlatformCanvas(size.width, size.height, true,
+                                              0, skia::RETURN_NULL_ON_FAILURE);
+  if (canvas) {
+    view->paint(webkit_glue::ToWebCanvas(canvas),
+                WebRect(0, 0, size.width, size.height));
+  }
+  return canvas;
 }
 
 #if !defined(OS_MACOSX)
 void MakeBitmapOpaque(SkBitmap* bitmap) {
   SkAutoLockPixels lock(*bitmap);
   DCHECK(bitmap->config() == SkBitmap::kARGB_8888_Config);
   for (int y = 0; y < bitmap->height(); ++y) {
     uint32_t* row = bitmap->getAddr32(0, y);
     for (int x = 0; x < bitmap->width(); ++x)
       row[x] |= 0xFF000000;  // Set alpha bits to 1.
   }
 }
 #endif
 
 void CaptureSnapshot(WebView* view, SkBitmap* snapshot) {
-  skia::PlatformCanvas canvas;
-  if (!PaintViewIntoCanvas(view, canvas))
+  SkCanvas* canvas = PaintViewIntoCanvas(view);
+  if (!canvas)
     return;
 
-  SkDevice* device = skia::GetTopDevice(canvas);
+  SkDevice* device = skia::GetTopDevice(*canvas);
 
   const SkBitmap& bitmap = device->accessBitmap(false);
   bitmap.copyTo(snapshot, SkBitmap::kARGB_8888_Config);
 
 #if !defined(OS_MACOSX)
   // Only the expected PNGs for Mac have a valid alpha channel.
   MakeBitmapOpaque(snapshot);
 #endif
 
 }
@@ skipping 182 matching lines @@
     const FilePath& current_working_directory) {
   current_working_directory_ = current_working_directory;
 }
 
 void WebKitTestRunner::OnSetIsMainWindow() {
   is_main_window_ = true;
   ShellRenderProcessObserver::GetInstance()->SetMainWindow(render_view(), this);
 }
 
 }  // namespace content