Remove SkDevice and SkBaseDevice outside skia/ext/

cc/output/software_renderer.cc

 // Copyright 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 "cc/output/software_renderer.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 110 matching lines @@
 }
 
 void SoftwareRenderer::EnsureScissorTestDisabled() {
   // There is no explicit notion of enabling/disabling scissoring in software
   // rendering, but the underlying effect we want is to clear any existing
   // clipRect on the current SkCanvas. This is done by setting clipRect to
   // the viewport's dimensions.
   if (!current_canvas_)
     return;
   is_scissor_enabled_ = false;
-  SkISize size = current_canvas_->getDeviceSize();
+  SkISize size = current_canvas_->getBaseLayerSize();
   SetClipRect(gfx::Rect(size.width(), size.height()));
 }
 
 void SoftwareRenderer::Finish() {}
 
 void SoftwareRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) {
   DCHECK(!output_surface_->HasExternalStencilTest());
   current_framebuffer_lock_ = nullptr;
   current_framebuffer_canvas_.clear();
   current_canvas_ = root_canvas_;
@@ skipping 571 matching lines @@
 
   if (filter_backdrop_bitmap.empty())
     return skia::RefPtr<SkShader>();
 
   return skia::AdoptRef(SkShader::CreateBitmapShader(
       filter_backdrop_bitmap, content_tile_mode, content_tile_mode,
       &filter_backdrop_transform));
 }
 
 }  // namespace cc