Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/resources/bitmap_skpicture_content_layer_updater.cc

 // Copyright 2011 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/resources/bitmap_skpicture_content_layer_updater.h"
 
 #include "base/time/time.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/resources/layer_painter.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_update_queue.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 
 namespace cc {
 
 BitmapSkPictureContentLayerUpdater::Resource::Resource(
     BitmapSkPictureContentLayerUpdater* updater,
     scoped_ptr<PrioritizedResource> texture)
     : ContentLayerUpdater::Resource(texture.Pass()), updater_(updater) {}
 
 void BitmapSkPictureContentLayerUpdater::Resource::Update(
     ResourceUpdateQueue* queue,
     gfx::Rect source_rect,
     gfx::Vector2d dest_offset,
     bool partial_update) {
   bitmap_.setConfig(
       SkBitmap::kARGB_8888_Config, source_rect.width(), source_rect.height());
   bitmap_.allocPixels();
   bitmap_.setIsOpaque(updater_->layer_is_opaque());
-  SkDevice device(bitmap_);
+  SkBitmapDevice device(bitmap_);
   SkCanvas canvas(&device);
   updater_->PaintContentsRect(&canvas, source_rect);
 
   ResourceUpdate upload = ResourceUpdate::Create(
       texture(), &bitmap_, source_rect, source_rect, dest_offset);
   if (partial_update)
     queue->AppendPartialUpload(upload);
   else
     queue->AppendFullUpload(upload);
 }
@@ skipping 38 matching lines @@
   base::TimeDelta duration =
       rendering_stats_instrumentation_->EndRecording(start_time);
   rendering_stats_instrumentation_->AddRaster(
       duration,
       duration,
       source_rect.width() * source_rect.height(),
       false);
 }
 
 }  // namespace cc