Index: cc/raster/one_copy_tile_task_worker_pool.h |
diff --git a/cc/raster/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h |
index 518aaa2d490751ca1d5009a674a0726423711a10..b4afb853d6d31c16eb144a16749e188d63257080 100644 |
--- a/cc/raster/one_copy_tile_task_worker_pool.h |
+++ b/cc/raster/one_copy_tile_task_worker_pool.h |
@@ -63,9 +63,9 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
// Playback raster source and schedule copy of |raster_resource| resource to |
// |output_resource|. Returns a non-zero sequence number for this copy |
// operation. |
- CopySequenceNumber PlaybackAndScheduleCopyOnWorkerThread( |
+ void PlaybackAndCopyOnWorkerThread( |
bool reusing_raster_resource, |
- scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> |
+ scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBufferForThread> |
raster_resource_write_lock, |
const Resource* raster_resource, |
const Resource* output_resource, |
@@ -92,28 +92,7 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
bool have_persistent_gpu_memory_buffers); |
private: |
- struct CopyOperation { |
- typedef ScopedPtrDeque<CopyOperation> Deque; |
- |
- CopyOperation(scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> |
- src_write_lock, |
- const Resource* src, |
- const Resource* dst, |
- const gfx::Rect& rect); |
- ~CopyOperation(); |
- |
- scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> src_write_lock; |
- const Resource* src; |
- const Resource* dst; |
- const gfx::Rect rect; |
- }; |
- |
void OnTaskSetFinished(TaskSet task_set); |
- void AdvanceLastFlushedCopyTo(CopySequenceNumber sequence); |
- void IssueCopyOperations(int64 count); |
- void ScheduleCheckForCompletedCopyOperationsWithLockAcquired( |
- bool wait_if_needed); |
- void CheckForCompletedCopyOperations(bool wait_if_needed); |
scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue() |
const; |
void StagingStateAsValueInto( |
@@ -130,8 +109,6 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
const bool have_persistent_gpu_memory_buffers_; |
TaskSetCollection tasks_pending_; |
scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets]; |
- CopySequenceNumber last_issued_copy_operation_; |
- CopySequenceNumber last_flushed_copy_operation_; |
// Task graph used when scheduling tasks and vector used to gather |
// completed tasks. |
@@ -139,14 +116,6 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
Task::Vector completed_tasks_; |
base::Lock lock_; |
- // |lock_| must be acquired when accessing the following members. |
- base::ConditionVariable copy_operation_count_cv_; |
- int bytes_scheduled_since_last_flush_; |
- size_t issued_copy_operation_count_; |
- CopyOperation::Deque pending_copy_operations_; |
- CopySequenceNumber next_copy_operation_sequence_; |
- bool check_for_completed_copy_operations_pending_; |
- base::TimeTicks last_check_for_completed_copy_operations_time_; |
bool shutdown_; |
base::WeakPtrFactory<OneCopyTileTaskWorkerPool> weak_ptr_factory_; |