Eliminate skia::PlatformCanvas - Step 1

content/renderer/webplugin_delegate_proxy.cc

 // Copyright (c) 2011 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/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 707 matching lines @@
   if (!uses_shared_bitmaps_)
     return;
 
   // We got a paint before the plugin's coordinates, so there's no buffer to
   // copy from.
   if (!backing_store_canvas_.get())
     return;
 
   // We're using the native OS APIs from here on out.
 #if WEBKIT_USING_SKIA
-  gfx::NativeDrawingContext context = canvas->beginPlatformPaint();
+  gfx::NativeDrawingContext context = skia::BeginPlatformPaint(canvas);
 #elif WEBKIT_USING_CG
   gfx::NativeDrawingContext context = canvas;
 #endif
 
   gfx::Rect offset_rect = rect;
   offset_rect.Offset(-plugin_rect_.x(), -plugin_rect_.y());
   gfx::Rect canvas_rect = offset_rect;
 #if defined(OS_MACOSX)
   // The canvases are flipped relative to the context, so flip the rect too.
   FlipRectVerticallyWithHeight(&canvas_rect, plugin_rect_.height());
@@ skipping 17 matching lines @@
 
   if (invalidate_pending_) {
     // Only send the PaintAck message if this paint is in response to an
     // invalidate from the plugin, since this message acts as an access token
     // to ensure only one process is using the transport dib at a time.
     invalidate_pending_ = false;
     Send(new PluginMsg_DidPaint(instance_id_));
   }
 
 #if WEBKIT_USING_SKIA
-  canvas->endPlatformPaint();
+  skia::EndPlatformPaint(canvas);
 #endif
 }
 
 bool WebPluginDelegateProxy::BackgroundChanged(
     gfx::NativeDrawingContext context,
     const gfx::Rect& rect) {
 #if defined(OS_WIN)
   HBITMAP hbitmap = static_cast<HBITMAP>(GetCurrentObject(context, OBJ_BITMAP));
   if (hbitmap == NULL) {
     NOTREACHED();
@@ skipping 611 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }