Remove SkDevice and SkBaseDevice outside skia/ext/

ui/gfx/canvas.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 "ui/gfx/canvas.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 102 matching lines @@
 
 // static
 int Canvas::DefaultCanvasTextAlignment() {
   return base::i18n::IsRTL() ? TEXT_ALIGN_RIGHT : TEXT_ALIGN_LEFT;
 }
 
 ImageSkiaRep Canvas::ExtractImageRep() const {
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
   // to call extractSubset or the copy constructor, since we want an actual copy
   // of the bitmap.
-  const SkISize size = canvas_->getDeviceSize();
+  const SkISize size = canvas_->getBaseLayerSize();
   SkBitmap result;
   result.allocN32Pixels(size.width(), size.height());
 
   canvas_->readPixels(&result, 0, 0);
   return ImageSkiaRep(result, image_scale_);
 }
 
 void Canvas::DrawDashedRect(const Rect& rect, SkColor color) {
   if (rect.IsEmpty())
     return;
@@ skipping 450 matching lines @@
   // by the paint).
   SkPaint p(paint);
   p.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
   p.setShader(shader.get());
 
   // The rect will be filled by the bitmap.
   canvas_->drawRect(dest_rect, p);
 }
 
 }  // namespace gfx