Removal of dependencies on PlatformDevice classes.

webkit/tools/test_shell/mac/webwidget_host.mm

 // Copyright (c) 2008-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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 #include "base/logging.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 161 matching lines @@
   // Allocate a canvas if necessary
   if (!canvas_.get()) {
     ResetScrollRect();
     paint_rect_ = client_rect;
     canvas_.reset(new skia::PlatformCanvas(
         paint_rect_.width(), paint_rect_.height(), true));
   }
 
   // make sure webkit draws into our bitmap, not the window
   CGContextRef bitmap_context =
-      canvas_->getTopPlatformDevice().GetBitmapContext();
+      skia::GetBitmapContext(skia::GetTopDevice(*canvas_));
   [NSGraphicsContext setCurrentContext:
       [NSGraphicsContext graphicsContextWithGraphicsPort:bitmap_context
                                                  flipped:YES]];
 
   webwidget_->animate();
 
   // This may result in more invalidation
   webwidget_->layout();
 
   // Scroll the canvas if necessary
@@ skipping 21 matching lines @@
 
   // set the context back to our window
   [NSGraphicsContext setCurrentContext: view_context];
 
   // Paint to the screen
   if ([view_ lockFocusIfCanDraw]) {
     int bitmap_height = CGBitmapContextGetHeight(bitmap_context);
     int bitmap_width = CGBitmapContextGetWidth(bitmap_context);
     CGRect bitmap_rect = { { 0, 0 },
                            { bitmap_width, bitmap_height } };
-    canvas_->getTopPlatformDevice().DrawToContext(
-        context, 0, client_rect.height() - bitmap_height, &bitmap_rect);
+    skia::DrawToNativeContext(canvas_.get(), context, 0,
+        client_rect.height() - bitmap_height, &bitmap_rect);
 
     [view_ unlockFocus];
   }
 }
 
 WebScreenInfo WebWidgetHost::GetScreenInfo() {
   return WebScreenInfoFactory::screenInfo(view_);
 }
 
 void WebWidgetHost::Resize(const gfx::Rect& rect) {
@@ skipping 41 matching lines @@
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
 #ifndef NDEBUG
   DCHECK(!painting_);
 #endif
   DCHECK(canvas_.get());
 
   set_painting(true);
   webwidget_->paint(webkit_glue::ToWebCanvas(canvas_.get()), rect);
   set_painting(false);
 }