Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/resources/raster_worker_pool.h

 // 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.
 
 #ifndef CC_RESOURCES_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_RASTER_WORKER_POOL_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "cc/resources/raster_mode.h"
 #include "cc/resources/tile_priority.h"
 #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;
 }
 
 namespace cc {
 class PicturePileImpl;
 class PixelBufferRasterWorkerPool;
 class Resource;
 class ResourceProvider;
 
 namespace internal {
 
 class CC_EXPORT RasterWorkerPoolTask
     : public base::RefCounted<RasterWorkerPoolTask> {
  public:
   typedef std::vector<scoped_refptr<WorkerPoolTask> > TaskVector;
 
   // 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);
   bool HasFinishedRunning() const;
   bool WasCanceled() const;
   void WillComplete();
   void DidComplete();
   bool HasCompleted() const;
 
   const Resource* resource() const { return resource_; }
@@ skipping 222 matching lines @@
 
   base::WeakPtrFactory<RasterWorkerPool> weak_ptr_factory_;
   scoped_refptr<internal::WorkerPoolTask> raster_finished_task_;
   scoped_refptr<internal::WorkerPoolTask>
       raster_required_for_activation_finished_task_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RASTER_WORKER_POOL_H_