| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/resources/raster_worker_pool.h" | 5 #include "cc/resources/raster_worker_pool.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 public: | 46 public: |
| 47 typedef base::Callback< | 47 typedef base::Callback< |
| 48 void(const PicturePileImpl::Analysis& analysis, bool was_canceled)> Reply; | 48 void(const PicturePileImpl::Analysis& analysis, bool was_canceled)> Reply; |
| 49 | 49 |
| 50 TestRasterTaskImpl(const Resource* resource, | 50 TestRasterTaskImpl(const Resource* resource, |
| 51 const Reply& reply, | 51 const Reply& reply, |
| 52 ImageDecodeTask::Vector* dependencies) | 52 ImageDecodeTask::Vector* dependencies) |
| 53 : RasterTask(resource, dependencies), reply_(reply) {} | 53 : RasterTask(resource, dependencies), reply_(reply) {} |
| 54 | 54 |
| 55 // Overridden from Task: | 55 // Overridden from Task: |
| 56 virtual void RunOnWorkerThread() OVERRIDE { | 56 virtual void RunOnWorkerThread() override { |
| 57 skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas(); | 57 skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas(); |
| 58 DCHECK(canvas); | 58 DCHECK(canvas); |
| 59 canvas->drawColor(SK_ColorWHITE); | 59 canvas->drawColor(SK_ColorWHITE); |
| 60 raster_buffer_->ReleaseSkCanvas(canvas); | 60 raster_buffer_->ReleaseSkCanvas(canvas); |
| 61 } | 61 } |
| 62 | 62 |
| 63 // Overridden from RasterizerTask: | 63 // Overridden from RasterizerTask: |
| 64 virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE { | 64 virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override { |
| 65 raster_buffer_ = client->AcquireBufferForRaster(resource()); | 65 raster_buffer_ = client->AcquireBufferForRaster(resource()); |
| 66 } | 66 } |
| 67 virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE { | 67 virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override { |
| 68 client->ReleaseBufferForRaster(raster_buffer_.Pass()); | 68 client->ReleaseBufferForRaster(raster_buffer_.Pass()); |
| 69 } | 69 } |
| 70 virtual void RunReplyOnOriginThread() OVERRIDE { | 70 virtual void RunReplyOnOriginThread() override { |
| 71 reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning()); | 71 reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning()); |
| 72 } | 72 } |
| 73 | 73 |
| 74 protected: | 74 protected: |
| 75 virtual ~TestRasterTaskImpl() {} | 75 virtual ~TestRasterTaskImpl() {} |
| 76 | 76 |
| 77 private: | 77 private: |
| 78 const Reply reply_; | 78 const Reply reply_; |
| 79 scoped_ptr<RasterBuffer> raster_buffer_; | 79 scoped_ptr<RasterBuffer> raster_buffer_; |
| 80 | 80 |
| 81 DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl); | 81 DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 class BlockingTestRasterTaskImpl : public TestRasterTaskImpl { | 84 class BlockingTestRasterTaskImpl : public TestRasterTaskImpl { |
| 85 public: | 85 public: |
| 86 BlockingTestRasterTaskImpl(const Resource* resource, | 86 BlockingTestRasterTaskImpl(const Resource* resource, |
| 87 const Reply& reply, | 87 const Reply& reply, |
| 88 base::Lock* lock, | 88 base::Lock* lock, |
| 89 ImageDecodeTask::Vector* dependencies) | 89 ImageDecodeTask::Vector* dependencies) |
| 90 : TestRasterTaskImpl(resource, reply, dependencies), lock_(lock) {} | 90 : TestRasterTaskImpl(resource, reply, dependencies), lock_(lock) {} |
| 91 | 91 |
| 92 // Overridden from Task: | 92 // Overridden from Task: |
| 93 virtual void RunOnWorkerThread() OVERRIDE { | 93 virtual void RunOnWorkerThread() override { |
| 94 base::AutoLock lock(*lock_); | 94 base::AutoLock lock(*lock_); |
| 95 TestRasterTaskImpl::RunOnWorkerThread(); | 95 TestRasterTaskImpl::RunOnWorkerThread(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 // Overridden from RasterizerTask: | 98 // Overridden from RasterizerTask: |
| 99 virtual void RunReplyOnOriginThread() OVERRIDE {} | 99 virtual void RunReplyOnOriginThread() override {} |
| 100 | 100 |
| 101 protected: | 101 protected: |
| 102 virtual ~BlockingTestRasterTaskImpl() {} | 102 virtual ~BlockingTestRasterTaskImpl() {} |
| 103 | 103 |
| 104 private: | 104 private: |
| 105 base::Lock* lock_; | 105 base::Lock* lock_; |
| 106 | 106 |
| 107 DISALLOW_COPY_AND_ASSIGN(BlockingTestRasterTaskImpl); | 107 DISALLOW_COPY_AND_ASSIGN(BlockingTestRasterTaskImpl); |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 class RasterWorkerPoolTest | 110 class RasterWorkerPoolTest |
| 111 : public testing::TestWithParam<RasterWorkerPoolType>, | 111 : public testing::TestWithParam<RasterWorkerPoolType>, |
| 112 public RasterizerClient { | 112 public RasterizerClient { |
| 113 public: | 113 public: |
| 114 struct RasterTaskResult { | 114 struct RasterTaskResult { |
| 115 unsigned id; | 115 unsigned id; |
| 116 bool canceled; | 116 bool canceled; |
| 117 }; | 117 }; |
| 118 | 118 |
| 119 typedef std::vector<scoped_refptr<RasterTask> > RasterTaskVector; | 119 typedef std::vector<scoped_refptr<RasterTask> > RasterTaskVector; |
| 120 | 120 |
| 121 enum NamedTaskSet { REQUIRED_FOR_ACTIVATION = 0, ALL = 1 }; | 121 enum NamedTaskSet { REQUIRED_FOR_ACTIVATION = 0, ALL = 1 }; |
| 122 | 122 |
| 123 RasterWorkerPoolTest() | 123 RasterWorkerPoolTest() |
| 124 : context_provider_(TestContextProvider::Create()), | 124 : context_provider_(TestContextProvider::Create()), |
| 125 timeout_seconds_(5), | 125 timeout_seconds_(5), |
| 126 timed_out_(false) {} | 126 timed_out_(false) {} |
| 127 | 127 |
| 128 // Overridden from testing::Test: | 128 // Overridden from testing::Test: |
| 129 virtual void SetUp() OVERRIDE { | 129 virtual void SetUp() override { |
| 130 switch (GetParam()) { | 130 switch (GetParam()) { |
| 131 case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER: | 131 case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER: |
| 132 Create3dOutputSurfaceAndResourceProvider(); | 132 Create3dOutputSurfaceAndResourceProvider(); |
| 133 raster_worker_pool_ = PixelBufferRasterWorkerPool::Create( | 133 raster_worker_pool_ = PixelBufferRasterWorkerPool::Create( |
| 134 base::MessageLoopProxy::current().get(), | 134 base::MessageLoopProxy::current().get(), |
| 135 RasterWorkerPool::GetTaskGraphRunner(), | 135 RasterWorkerPool::GetTaskGraphRunner(), |
| 136 context_provider_.get(), | 136 context_provider_.get(), |
| 137 resource_provider_.get(), | 137 resource_provider_.get(), |
| 138 kMaxTransferBufferUsageBytes); | 138 kMaxTransferBufferUsageBytes); |
| 139 break; | 139 break; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 168 base::MessageLoopProxy::current().get(), | 168 base::MessageLoopProxy::current().get(), |
| 169 RasterWorkerPool::GetTaskGraphRunner(), | 169 RasterWorkerPool::GetTaskGraphRunner(), |
| 170 resource_provider_.get()); | 170 resource_provider_.get()); |
| 171 break; | 171 break; |
| 172 } | 172 } |
| 173 | 173 |
| 174 DCHECK(raster_worker_pool_); | 174 DCHECK(raster_worker_pool_); |
| 175 raster_worker_pool_->AsRasterizer()->SetClient(this); | 175 raster_worker_pool_->AsRasterizer()->SetClient(this); |
| 176 } | 176 } |
| 177 | 177 |
| 178 virtual void TearDown() OVERRIDE { | 178 virtual void TearDown() override { |
| 179 raster_worker_pool_->AsRasterizer()->Shutdown(); | 179 raster_worker_pool_->AsRasterizer()->Shutdown(); |
| 180 raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks(); | 180 raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks(); |
| 181 } | 181 } |
| 182 | 182 |
| 183 // Overriden from RasterWorkerPoolClient: | 183 // Overriden from RasterWorkerPoolClient: |
| 184 virtual void DidFinishRunningTasks(TaskSet task_set) OVERRIDE { | 184 virtual void DidFinishRunningTasks(TaskSet task_set) override { |
| 185 if (task_set == ALL) { | 185 if (task_set == ALL) { |
| 186 raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks(); | 186 raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks(); |
| 187 base::MessageLoop::current()->Quit(); | 187 base::MessageLoop::current()->Quit(); |
| 188 } | 188 } |
| 189 } | 189 } |
| 190 virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const OVERRIDE { | 190 virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const override { |
| 191 return TaskSetCollection(); | 191 return TaskSetCollection(); |
| 192 } | 192 } |
| 193 | 193 |
| 194 void RunMessageLoopUntilAllTasksHaveCompleted() { | 194 void RunMessageLoopUntilAllTasksHaveCompleted() { |
| 195 if (timeout_seconds_) { | 195 if (timeout_seconds_) { |
| 196 timeout_.Reset( | 196 timeout_.Reset( |
| 197 base::Bind(&RasterWorkerPoolTest::OnTimeout, base::Unretained(this))); | 197 base::Bind(&RasterWorkerPoolTest::OnTimeout, base::Unretained(this))); |
| 198 base::MessageLoopProxy::current()->PostDelayedTask( | 198 base::MessageLoopProxy::current()->PostDelayedTask( |
| 199 FROM_HERE, | 199 FROM_HERE, |
| 200 timeout_.callback(), | 200 timeout_.callback(), |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 INSTANTIATE_TEST_CASE_P(RasterWorkerPoolTests, | 393 INSTANTIATE_TEST_CASE_P(RasterWorkerPoolTests, |
| 394 RasterWorkerPoolTest, | 394 RasterWorkerPoolTest, |
| 395 ::testing::Values(RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER, | 395 ::testing::Values(RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER, |
| 396 RASTER_WORKER_POOL_TYPE_ZERO_COPY, | 396 RASTER_WORKER_POOL_TYPE_ZERO_COPY, |
| 397 RASTER_WORKER_POOL_TYPE_ONE_COPY, | 397 RASTER_WORKER_POOL_TYPE_ONE_COPY, |
| 398 RASTER_WORKER_POOL_TYPE_GPU, | 398 RASTER_WORKER_POOL_TYPE_GPU, |
| 399 RASTER_WORKER_POOL_TYPE_BITMAP)); | 399 RASTER_WORKER_POOL_TYPE_BITMAP)); |
| 400 | 400 |
| 401 } // namespace | 401 } // namespace |
| 402 } // namespace cc | 402 } // namespace cc |
| OLD | NEW |