Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

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/debug/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/software_output_device.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkLayerRasterizer.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 namespace {
@@ skipping 86 matching lines @@
   is_scissor_enabled_ = true;
   SetClipRect(scissor_rect_);
 }
 
 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.
   is_scissor_enabled_ = false;
-  SkDevice* device = current_canvas_->getDevice();
+  SkBaseDevice* device = current_canvas_->getDevice();
   SetClipRect(gfx::Rect(device->width(), device->height()));
 }
 
 void SoftwareRenderer::Finish() {}
 
 void SoftwareRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) {
   DCHECK(!client_->ExternalStencilTestEnabled());
   current_framebuffer_lock_.reset();
   current_canvas_ = root_canvas_;
 }
@@ skipping 169 matching lines @@
       SkMatrix::kFill_ScaleToFit);
   current_canvas_->concat(content_matrix);
 
   if (quad->ShouldDrawWithBlending()) {
     TRACE_EVENT0("cc", "SoftwareRenderer::DrawPictureQuad with blending");
     SkBitmap temp_bitmap;
     temp_bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                           quad->texture_size.width(),
                           quad->texture_size.height());
     temp_bitmap.allocPixels();
-    SkDevice temp_device(temp_bitmap);
+    SkBitmapDevice temp_device(temp_bitmap);
     SkCanvas temp_canvas(&temp_device);
 
     quad->picture_pile->RasterToBitmap(
         &temp_canvas, quad->content_rect, quad->contents_scale, NULL);
 
     current_paint_.setFilterBitmap(true);
     current_canvas_->drawBitmap(temp_bitmap, 0, 0, &current_paint_);
   } else {
     TRACE_EVENT0("cc",
                  "SoftwareRenderer::DrawPictureQuad direct from PicturePile");
@@ skipping 205 matching lines @@
     EnsureBackbuffer();
   else
     DiscardBackbuffer();
 }
 
 void SoftwareRenderer::SetDiscardBackBufferWhenNotVisible(bool discard) {
   // The software renderer always discards the backbuffer when not visible.
 }
 
 }  // namespace cc