| Index: cc/resources/raster_worker_pool.h
|
| diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h
|
| index a53e52ff4b2acc507c184cf640339448b6a812bc..cededc1afe4687974d8f11ff971f6bdd56921673 100644
|
| --- a/cc/resources/raster_worker_pool.h
|
| +++ b/cc/resources/raster_worker_pool.h
|
| @@ -14,8 +14,6 @@
|
| #include "cc/resources/tile_priority.h"
|
| #include "cc/resources/worker_pool.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| -// TODO(robertphillips): change this to "class SkBaseDevice;"
|
| -#include "third_party/skia/include/core/SkDevice.h"
|
|
|
| namespace skia {
|
| class LazyPixelRef;
|
| @@ -34,11 +32,12 @@ class CC_EXPORT 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
|
| + // Returns true if |buffer| was written to. False indicate that
|
| + // the content of |buffer| is undefined and the resource doesn't
|
| // need to be initialized.
|
| - virtual bool RunOnWorkerThread(SkBaseDevice* device,
|
| - unsigned thread_index) = 0;
|
| + virtual bool RunOnWorkerThread(unsigned thread_index,
|
| + void* buffer,
|
| + gfx::Size size) = 0;
|
| virtual void CompleteOnOriginThread() = 0;
|
|
|
| void DidRun(bool was_canceled);
|
| @@ -202,7 +201,8 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool {
|
| int source_frame_number,
|
| RenderingStatsInstrumentation* rendering_stats,
|
| const RasterTask::Reply& reply,
|
| - Task::Set* dependencies);
|
| + Task::Set* dependencies,
|
| + bool use_16bit_tiles);
|
|
|
| static Task CreateImageDecodeTask(
|
| skia::LazyPixelRef* pixel_ref,
|
|
|