Remove SkDevice and SkBaseDevice outside skia/ext/

content/renderer/npapi/webplugin_delegate_proxy.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/renderer/npapi/webplugin_delegate_proxy.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 553 matching lines @@
     return;
   }
 
   plugin_rect_ = window_rect;
   clip_rect_ = clip_rect;
 
   bool bitmaps_changed = false;
 
   if (uses_shared_bitmaps_) {
     if (!front_buffer_canvas() ||
-        (window_rect.width() != front_buffer_canvas()->getDevice()->width() ||
-         window_rect.height() != front_buffer_canvas()->getDevice()->height()))
+        (window_rect.width() !=
+             front_buffer_canvas()->getBaseLayerSize().width() ||
+         window_rect.height() !=
+             front_buffer_canvas()->getBaseLayerSize().height()))
     {
       bitmaps_changed = true;
 
       // Create a shared memory section that the plugin paints into
       // asynchronously.
       ResetWindowlessBitmaps();
       if (!window_rect.IsEmpty()) {
         if (!CreateSharedBitmap(&transport_stores_[0].bitmap,
                                 &transport_stores_[0].canvas) ||
             !CreateSharedBitmap(&transport_stores_[1].bitmap,
@@ skipping 96 matching lines @@
   if (!transport_store_painted_.Contains(offset_rect)) {
     Send(new PluginMsg_Paint(instance_id_, offset_rect));
     // Since the plugin is not blocked on the renderer in this context, there is
     // a chance that it will begin repainting the back-buffer before we complete
     // capturing the data. Buffer flipping would increase that risk because
     // geometry update is asynchronous, so we don't want to use buffer flipping
     // here.
     UpdateFrontBuffer(offset_rect, false);
   }
 
-  const SkBitmap& bitmap =
-      front_buffer_canvas()->getDevice()->accessBitmap(false);
+  const SkBitmap bitmap = skia::ReadPixels(front_buffer_canvas());
   SkPaint paint;
   paint.setXfermodeMode(
       transparent_ ? SkXfermode::kSrcATop_Mode : SkXfermode::kSrc_Mode);
   SkRect src_rect = gfx::RectToSkRect(offset_rect);
   canvas->drawBitmapRect(bitmap,
                          src_rect,
                          gfx::RectToSkRect(rect),
                          &paint);
 
   if (invalidate_pending_) {
@@ skipping 523 matching lines @@
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
 
 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url,
                                                          bool* result) {
   *result = plugin_->CheckIfRunInsecureContent(url);
 }
 
 }  // namespace content