Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/resources/raster_worker_pool.h

Index: cc/resources/raster_worker_pool.h
diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h
index 8c4b4934c56e6a1fecd59b2de4d4210387ed303d..1699a5ff5387e1e2bb2a887ed15ba3e7d4d0abd0 100644
--- a/cc/resources/raster_worker_pool.h
+++ b/cc/resources/raster_worker_pool.h
@@ -15,7 +15,8 @@
 #include "cc/resources/worker_pool.h"
 #include "third_party/khronos/GLES2/gl2.h"
 

[danakj, 2013/08/22 19:48:30]

drop the newline here if you're making it an include

[robertphillips, 2013/08/22 19:55:53]

Done.

-class SkDevice;
+// TODO(robertphillips): change this to "class SkBaseDevice;"

[danakj, 2013/08/22 19:48:30]

and this?

+#include "third_party/skia/include/core/SkDevice.h"
 
 namespace skia {
 class LazyPixelRef;
@@ -37,7 +38,8 @@ class CC_EXPORT RasterWorkerPoolTask
   // Returns true if |device| was written to. False indicate that
   // the content of |device| is undefined and the resource doesn't
   // need to be initialized.
-  virtual bool RunOnWorkerThread(SkDevice* device, unsigned thread_index) = 0;
+  virtual bool RunOnWorkerThread(SkBaseDevice* device,
+                                 unsigned thread_index) = 0;
   virtual void CompleteOnOriginThread() = 0;
 
   void DidRun(bool was_canceled);