Remove SkDevice and SkBaseDevice outside skia/ext/

content/renderer/android/synchronous_compositor_output_surface.cc

 // Copyright 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 "content/renderer/android/synchronous_compositor_output_surface.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
@@ skipping 146 matching lines @@
 
   base::AutoReset<SkCanvas*> canvas_resetter(&current_sw_canvas_, canvas);
 
   SkIRect canvas_clip;
   canvas->getClipDeviceBounds(&canvas_clip);
   gfx::Rect clip = gfx::SkIRectToRect(canvas_clip);
 
   gfx::Transform transform(gfx::Transform::kSkipInitialization);
   transform.matrix() = canvas->getTotalMatrix();  // Converts 3x3 matrix to 4x4.
 
-  surface_size_ = gfx::Size(canvas->getDeviceSize().width(),
-                            canvas->getDeviceSize().height());
+  surface_size_ = gfx::Size(canvas->getBaseLayerSize().width(),
+                            canvas->getBaseLayerSize().height());
 
   // Pass in the cached hw viewport and transform for tile priority to avoid
   // tile thrashing when the WebView is alternating between hardware and
   // software draws.
   InvokeComposite(transform,
                   clip,
                   clip,
                   cached_hw_viewport_rect_for_tile_priority_,
                   cached_hw_transform_for_tile_priority_,
                   false);
@@ skipping 89 matching lines @@
   scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
       frame_swap_message_queue_->AcquireSendMessageScope();
   frame_swap_message_queue_->DrainMessages(messages);
 }
 
 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace content