cc: Simplify task and its derived classes.

cc/raster/one_copy_tile_task_worker_pool.h

 // Copyright 2014 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_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 22 matching lines @@
 class GLES2Interface;
 }
 }
 
 namespace cc {
 class ResourcePool;
 
 class CC_EXPORT OneCopyTileTaskWorkerPool
     : public TileTaskWorkerPool,
       public TileTaskRunner,
-      public TileTaskClient,
       public base::trace_event::MemoryDumpProvider {
  public:
   ~OneCopyTileTaskWorkerPool() override;
 
   static scoped_ptr<TileTaskWorkerPool> Create(
       base::SequencedTaskRunner* task_runner,
       TaskGraphRunner* task_graph_runner,
       ContextProvider* context_provider,
       ResourceProvider* resource_provider,
       int max_copy_texture_chromium_size,
       bool use_partial_raster,
       int max_staging_buffer_usage_in_bytes,
       ResourceFormat preferred_tile_format);
 
   // Overridden from TileTaskWorkerPool:
   TileTaskRunner* AsTileTaskRunner() override;
 
+  // Overridden from RasterBufferProvider:
+  scoped_ptr<RasterBuffer> AcquireBufferForRaster(
+      const Resource* resource,
+      uint64_t resource_content_id,
+      uint64_t previous_content_id) override;
+  void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override;
+
   // Overridden from TileTaskRunner:
   void Shutdown() override;
   void ScheduleTasks(TaskGraph* graph) override;
   void CheckForCompletedTasks() override;
   ResourceFormat GetResourceFormat(bool must_support_alpha) const override;
   bool GetResourceRequiresSwizzle(bool must_support_alpha) const override;
 
-  // Overridden from TileTaskClient:
-  scoped_ptr<RasterBuffer> AcquireBufferForRaster(
-      const Resource* resource,
-      uint64_t resource_content_id,
-      uint64_t previous_content_id) override;
-  void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override;
-
   // Overridden from base::trace_event::MemoryDumpProvider:
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   // Playback raster source and copy result into |resource|.
   void PlaybackAndCopyOnWorkerThread(
       const Resource* resource,
       ResourceProvider::ScopedWriteLockGL* resource_lock,
       const RasterSource* raster_source,
       const gfx::Rect& raster_full_rect,
@@ skipping 74 matching lines @@
   base::Closure reduce_memory_usage_callback_;
 
   base::WeakPtrFactory<OneCopyTileTaskWorkerPool> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OneCopyTileTaskWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_