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..bb6c7b5b793a3f9a7cb97a7585243a45e458afb2 100644 |
--- a/cc/resources/one_copy_tile_task_worker_pool.h |
+++ b/cc/resources/one_copy_tile_task_worker_pool.h |
@@ -52,7 +52,7 @@ 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| |
@@ -60,7 +60,10 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
CopySequenceNumber PlaybackAndScheduleCopyOnWorkerThread( |
scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock, |
scoped_ptr<ScopedResource> src, |
- const Resource* dst, |
+ scoped_ptr<ResourceProvider::ScopedReadLockGpuMemoryBuffer> |
+ previous_frame_read_lock, |
+ scoped_ptr<ScopedResource> previous_frame_src, |
+ const TileTaskData& data, |
const RasterSource* raster_source, |
const gfx::Rect& rect, |
float scale); |
@@ -83,12 +86,18 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
CopyOperation( |
scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock, |
scoped_ptr<ScopedResource> src, |
- const Resource* dst); |
+ scoped_ptr<ResourceProvider::ScopedReadLockGpuMemoryBuffer> |
+ previous_frame_read_lock, |
+ scoped_ptr<ScopedResource> previous_frame_src, |
+ const TileTaskData& data); |
~CopyOperation(); |
scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock; |
scoped_ptr<ScopedResource> src; |
- const Resource* dst; |
+ scoped_ptr<ResourceProvider::ScopedReadLockGpuMemoryBuffer> |
+ previous_frame_read_lock; |
+ scoped_ptr<ScopedResource> previous_frame_src; |
+ TileTaskData tile_task_data; |
}; |
void OnTaskSetFinished(TaskSet task_set); |