| Index: cc/resources/pixel_buffer_raster_worker_pool.h
|
| diff --git a/cc/resources/pixel_buffer_raster_worker_pool.h b/cc/resources/pixel_buffer_raster_worker_pool.h
|
| index b5d1f78c3109f5c1fdeabd089ecbf401bff12948..ca46c4452a1d54b659aee126181b8d7e502597d9 100644
|
| --- a/cc/resources/pixel_buffer_raster_worker_pool.h
|
| +++ b/cc/resources/pixel_buffer_raster_worker_pool.h
|
| @@ -20,11 +20,13 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
|
| static scoped_ptr<RasterWorkerPool> Create(
|
| ResourceProvider* resource_provider,
|
| size_t num_threads,
|
| - size_t max_transfer_buffer_usage_bytes) {
|
| + size_t max_transfer_buffer_usage_bytes,
|
| + ResourceProvider::Format format) {
|
| return make_scoped_ptr<RasterWorkerPool>(
|
| new PixelBufferRasterWorkerPool(resource_provider,
|
| num_threads,
|
| - max_transfer_buffer_usage_bytes));
|
| + max_transfer_buffer_usage_bytes,
|
| + format));
|
| }
|
|
|
| // Overridden from WorkerPool:
|
| @@ -33,14 +35,15 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
|
|
|
| // Overridden from RasterWorkerPool:
|
| virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE;
|
| - virtual GLenum GetResourceFormat() const OVERRIDE;
|
| + virtual ResourceProvider::Format GetResourceFormat() const OVERRIDE;
|
| virtual void OnRasterTasksFinished() OVERRIDE;
|
| virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
|
|
|
| private:
|
| PixelBufferRasterWorkerPool(ResourceProvider* resource_provider,
|
| size_t num_threads,
|
| - size_t max_transfer_buffer_usage_bytes);
|
| + size_t max_transfer_buffer_usage_bytes,
|
| + ResourceProvider::Format format);
|
|
|
| void FlushUploads();
|
| void CheckForCompletedUploads();
|
| @@ -80,6 +83,7 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
|
|
|
| bool should_notify_client_if_no_tasks_are_pending_;
|
| bool should_notify_client_if_no_tasks_required_for_activation_are_pending_;
|
| + ResourceProvider::Format format_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
|
| };
|
|
|