Index: cc/resources/one_copy_tile_task_worker_pool.h |
diff --git a/cc/resources/one_copy_tile_task_worker_pool.h b/cc/resources/one_copy_tile_task_worker_pool.h |
index 51996677623909aa88ee1aeb1b93f2d0559f5ba8..e3a72a450706a4efdcaeaace541dea0a139b968e 100644 |
--- a/cc/resources/one_copy_tile_task_worker_pool.h |
+++ b/cc/resources/one_copy_tile_task_worker_pool.h |
@@ -52,15 +52,18 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
// Overridden from TileTaskClient: |
scoped_ptr<RasterBuffer> AcquireBufferForRaster( |
- const Resource* resource) override; |
+ const TileTaskData& data) override; |
void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; |
- // Playback raster source and schedule copy of |src| resource to |dst| |
- // resource. Returns a non-zero sequence number for this copy operation. |
+ // Playback raster source and schedule copy of |raster_resource| resource to |
+ // |data|'s resource. Returns a non-zero sequence number for this copy |
+ // operation. |
CopySequenceNumber PlaybackAndScheduleCopyOnWorkerThread( |
- scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock, |
- scoped_ptr<ScopedResource> src, |
- const Resource* dst, |
+ bool reusing_raster_resource, |
+ scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> |
+ raster_resource_write_lock, |
+ scoped_ptr<ScopedResource> raster_resource, |
+ const TileTaskData& data, |
const RasterSource* raster_source, |
const gfx::Rect& rect, |
float scale); |
@@ -80,15 +83,16 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
struct CopyOperation { |
typedef ScopedPtrDeque<CopyOperation> Deque; |
- CopyOperation( |
- scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock, |
- scoped_ptr<ScopedResource> src, |
- const Resource* dst); |
+ CopyOperation(scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> |
+ raster_resource_write_lock, |
+ scoped_ptr<ScopedResource> raster_resource, |
+ const TileTaskData& data); |
~CopyOperation(); |
- scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock; |
- scoped_ptr<ScopedResource> src; |
- const Resource* dst; |
+ scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> |
+ raster_resource_write_lock; |
+ scoped_ptr<ScopedResource> raster_resource; |
+ TileTaskData tile_task_data; |
}; |
void OnTaskSetFinished(TaskSet task_set); |