cc: Move GPU raster to DirectRasterWorkerPool.

cc/resources/pixel_buffer_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_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 
 #include <deque>
 
 #include "base/containers/hash_tables.h"
@@ skipping 11 matching lines @@
 #endif  // COMPILER
 
 namespace cc {
 
 class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
  public:
   virtual ~PixelBufferRasterWorkerPool();
 
   static scoped_ptr<RasterWorkerPool> Create(
       ResourceProvider* resource_provider,
-      ContextProvider* context_provider,
       size_t max_transfer_buffer_usage_bytes);
 
   // Overridden from RasterWorkerPool:
   virtual void Shutdown() OVERRIDE;
-  virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE;
+  virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE;
   virtual unsigned GetResourceTarget() const OVERRIDE;
   virtual ResourceFormat GetResourceFormat() const OVERRIDE;
   virtual void CheckForCompletedTasks() OVERRIDE;
 
   // Overridden from internal::WorkerPoolTaskClient:
   virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task)
       OVERRIDE;
   virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task,
                                  const PicturePileImpl::Analysis& analysis)
       OVERRIDE;
   virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE;
 
  protected:
   PixelBufferRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner,
                               ResourceProvider* resource_provider,
-                              ContextProvider* context_provider,
                               size_t max_transfer_buffer_usage_bytes);
 
  private:
   enum RasterTaskState { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED };
   typedef std::deque<scoped_refptr<internal::RasterWorkerPoolTask> >
       RasterTaskDeque;
   typedef internal::RasterWorkerPoolTask* RasterTaskMapKey;
   typedef base::hash_set<RasterTaskMapKey> RasterTaskSet;
   typedef base::hash_map<RasterTaskMapKey, RasterTaskState> RasterTaskStateMap;
 
@@ skipping 13 matching lines @@
   void CheckForCompletedWorkerPoolTasks();
   bool IsRasterTaskRequiredForActivation(internal::RasterWorkerPoolTask* task)
       const;
 
   const char* StateName() const;
   scoped_ptr<base::Value> StateAsValue() const;
   scoped_ptr<base::Value> ThrottleStateAsValue() const;
 
   bool shutdown_;
 
-  RasterTask::Queue raster_tasks_;
+  RasterTaskQueue raster_tasks_;
   RasterTaskSet raster_tasks_required_for_activation_;
   RasterTaskStateMap raster_task_states_;
   RasterTaskDeque raster_tasks_with_pending_upload_;
   RasterTaskDeque completed_raster_tasks_;
   TaskDeque completed_image_decode_tasks_;
 
   size_t scheduled_raster_task_count_;
   size_t bytes_pending_upload_;
   size_t max_bytes_pending_upload_;
   bool has_performed_uploads_since_last_flush_;
@@ skipping 11 matching lines @@
   internal::Task::Vector completed_tasks_;
 
   base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_