Remove SkDevice and SkBaseDevice outside skia/ext/

skia/ext/analysis_canvas.cc

 // Copyright (c) 2013 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 "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
@@ skipping 47 matching lines @@
 // that the canvas is not clipped (i.e. it covers ALL of the canvas).
 bool IsFullQuad(SkCanvas* canvas, const SkRect& drawn_rect) {
   if (!canvas->isClipRect())
     return false;
 
   SkIRect clip_irect;
   if (!canvas->getClipDeviceBounds(&clip_irect))
     return false;
   
   // if the clip is smaller than the canvas, we're partly clipped, so abort.
-  if (!clip_irect.contains(SkIRect::MakeSize(canvas->getDeviceSize())))
+  if (!clip_irect.contains(SkIRect::MakeSize(canvas->getBaseLayerSize())))
     return false;
 
   const SkMatrix& matrix = canvas->getTotalMatrix();
   // If the transform results in a non-axis aligned
   // rect, then be conservative and return false.
   if (!matrix.rectStaysRect())
     return false;
 
   SkRect device_rect;
   matrix.mapRect(&device_rect, drawn_rect);
@@ skipping 364 matching lines @@
   INHERITED::willSave();
 }
 
 SkCanvas::SaveLayerStrategy AnalysisCanvas::willSaveLayer(
     const SkRect* bounds,
     const SkPaint* paint,
     SkCanvas::SaveFlags flags) {
 
   ++saved_stack_size_;
 
-  SkIRect canvas_ibounds = SkIRect::MakeSize(this->getDeviceSize());
+  SkIRect canvas_ibounds = SkIRect::MakeSize(this->getBaseLayerSize());
   SkRect canvas_bounds;
   canvas_bounds.set(canvas_ibounds);
 
   // If after we draw to the saved layer, we have to blend with the current
   // layer, then we can conservatively say that the canvas will not be of
   // solid color.
   if ((paint && !IsSolidColorPaint(*paint)) ||
       (bounds && !bounds->contains(canvas_bounds))) {
     if (force_not_solid_stack_level_ == kNoLayer) {
       force_not_solid_stack_level_ = saved_stack_size_;
@@ skipping 33 matching lines @@
       force_not_transparent_stack_level_ = kNoLayer;
     }
   }
 
   INHERITED::willRestore();
 }
 
 }  // namespace skia