Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/resources/pixel_buffer_raster_worker_pool.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 "cc/resources/pixel_buffer_raster_worker_pool.h"
 
 #include "base/containers/stack_container.h"
 #include "base/debug/trace_event.h"
 #include "base/values.h"
 #include "cc/debug/traced_value.h"
 #include "cc/resources/resource.h"
-#include "third_party/skia/include/core/SkDevice.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/sys_utils.h"
 #endif
 
 namespace cc {
 
 namespace {
 
 class PixelBufferWorkerPoolTaskImpl : public internal::WorkerPoolTask {
@@ skipping 16 matching lines @@
       // |needs_upload_| still needs to be true as task has not
       // been canceled.
       needs_upload_ = true;
       return;
     }
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                      task_->resource()->size().width(),
                      task_->resource()->size().height());
     bitmap.setPixels(buffer_);
-    SkDevice device(bitmap);
+    SkBitmapDevice device(bitmap);
     needs_upload_ = task_->RunOnWorkerThread(&device, thread_index);
   }
   virtual void CompleteOnOriginThread() OVERRIDE {
     // |needs_upload_| must be be false if task didn't run.
     DCHECK(HasFinishedRunning() || !needs_upload_);
     reply_.Run(!HasFinishedRunning(), needs_upload_);
   }
 
  private:
   virtual ~PixelBufferWorkerPoolTaskImpl() {}
@@ skipping 630 matching lines @@
 
   throttle_state->SetInteger("bytes_available_for_upload",
                              max_bytes_pending_upload_ - bytes_pending_upload_);
   throttle_state->SetInteger("bytes_pending_upload", bytes_pending_upload_);
   throttle_state->SetInteger("scheduled_raster_task_count",
                              scheduled_raster_task_count_);
   return throttle_state.PassAs<base::Value>();
 }
 
 }  // namespace cc