Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

content/renderer/gpu/compositor_software_output_device.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 "content/renderer/gpu/compositor_software_output_device.h"
 
 #include "base/logging.h"
 #include "cc/output/software_frame_data.h"
 #include "content/renderer/render_process.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"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/skia_util.h"
 
 namespace content {
 
 CompositorSoftwareOutputDevice::Buffer::Buffer(
     unsigned id, scoped_ptr<base::SharedMemory> mem)
     : id_(id),
       mem_(mem.Pass()),
@@ skipping 118 matching lines @@
   current_index_ = FindFreeBuffer(current_index_ + 1);
   Buffer* current = buffers_[current_index_];
   DCHECK(current->free());
   current->SetFree(false);
 
   // Set up a canvas for the current front buffer.
   bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
                     viewport_size_.width(),
                     viewport_size_.height());
   bitmap_.setPixels(current->memory());
-  device_ = skia::AdoptRef(new SkDevice(bitmap_));
+  device_ = skia::AdoptRef(new SkBitmapDevice(bitmap_));
   canvas_ = skia::AdoptRef(new SkCanvas(device_.get()));
 
   if (!previous) {
     DCHECK(damage_rect == gfx::Rect(viewport_size_));
   } else {
     // Find the smallest damage region that needs
     // to be copied from the |previous| buffer.
     SkRegion region;
     bool found =
         current->FindDamageDifferenceFrom(previous, &region) ||
@@ skipping 58 matching lines @@
     return;
   } else {
     it = std::find_if(awaiting_ack_.begin(), awaiting_ack_.end(),
                       CompareById(id));
     DCHECK(it != awaiting_ack_.end());
     awaiting_ack_.erase(it);
   }
 }
 
 }  // namespace content