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/raster/raster_buffer_provider.h" | 5 #include "cc/raster/raster_buffer_provider.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 } | 221 } |
222 | 222 |
223 raster_buffer_provider_->OrderingBarrier(); | 223 raster_buffer_provider_->OrderingBarrier(); |
224 tile_task_manager_->ScheduleTasks(&graph_); | 224 tile_task_manager_->ScheduleTasks(&graph_); |
225 } | 225 } |
226 | 226 |
227 void AppendTask(unsigned id, const gfx::Size& size) { | 227 void AppendTask(unsigned id, const gfx::Size& size) { |
228 std::unique_ptr<ScopedResource> resource( | 228 std::unique_ptr<ScopedResource> resource( |
229 ScopedResource::Create(resource_provider_.get())); | 229 ScopedResource::Create(resource_provider_.get())); |
230 resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, | 230 resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, |
231 RGBA_8888); | 231 RGBA_8888, gfx::ColorSpace()); |
232 | 232 |
233 // The raster buffer has no tile ids associated with it for partial update, | 233 // The raster buffer has no tile ids associated with it for partial update, |
234 // so doesn't need to provide a valid dirty rect. | 234 // so doesn't need to provide a valid dirty rect. |
235 std::unique_ptr<RasterBuffer> raster_buffer = | 235 std::unique_ptr<RasterBuffer> raster_buffer = |
236 raster_buffer_provider_->AcquireBufferForRaster(resource.get(), 0, 0); | 236 raster_buffer_provider_->AcquireBufferForRaster(resource.get(), 0, 0); |
237 TileTask::Vector empty; | 237 TileTask::Vector empty; |
238 tasks_.push_back(new TestRasterTaskImpl(this, std::move(resource), id, | 238 tasks_.push_back(new TestRasterTaskImpl(this, std::move(resource), id, |
239 std::move(raster_buffer), &empty)); | 239 std::move(raster_buffer), &empty)); |
240 } | 240 } |
241 | 241 |
242 void AppendTask(unsigned id) { AppendTask(id, gfx::Size(1, 1)); } | 242 void AppendTask(unsigned id) { AppendTask(id, gfx::Size(1, 1)); } |
243 | 243 |
244 void AppendBlockingTask(unsigned id, base::Lock* lock) { | 244 void AppendBlockingTask(unsigned id, base::Lock* lock) { |
245 const gfx::Size size(1, 1); | 245 const gfx::Size size(1, 1); |
246 | 246 |
247 std::unique_ptr<ScopedResource> resource( | 247 std::unique_ptr<ScopedResource> resource( |
248 ScopedResource::Create(resource_provider_.get())); | 248 ScopedResource::Create(resource_provider_.get())); |
249 resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, | 249 resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, |
250 RGBA_8888); | 250 RGBA_8888, gfx::ColorSpace()); |
251 | 251 |
252 std::unique_ptr<RasterBuffer> raster_buffer = | 252 std::unique_ptr<RasterBuffer> raster_buffer = |
253 raster_buffer_provider_->AcquireBufferForRaster(resource.get(), 0, 0); | 253 raster_buffer_provider_->AcquireBufferForRaster(resource.get(), 0, 0); |
254 TileTask::Vector empty; | 254 TileTask::Vector empty; |
255 tasks_.push_back(new BlockingTestRasterTaskImpl( | 255 tasks_.push_back(new BlockingTestRasterTaskImpl( |
256 this, std::move(resource), id, std::move(raster_buffer), lock, &empty)); | 256 this, std::move(resource), id, std::move(raster_buffer), lock, &empty)); |
257 } | 257 } |
258 | 258 |
259 const std::vector<RasterTaskResult>& completed_tasks() const { | 259 const std::vector<RasterTaskResult>& completed_tasks() const { |
260 return completed_tasks_; | 260 return completed_tasks_; |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 | 390 |
391 INSTANTIATE_TEST_CASE_P(RasterBufferProviderTests, | 391 INSTANTIATE_TEST_CASE_P(RasterBufferProviderTests, |
392 RasterBufferProviderTest, | 392 RasterBufferProviderTest, |
393 ::testing::Values(RASTER_BUFFER_PROVIDER_TYPE_ZERO_COPY, | 393 ::testing::Values(RASTER_BUFFER_PROVIDER_TYPE_ZERO_COPY, |
394 RASTER_BUFFER_PROVIDER_TYPE_ONE_COPY, | 394 RASTER_BUFFER_PROVIDER_TYPE_ONE_COPY, |
395 RASTER_BUFFER_PROVIDER_TYPE_GPU, | 395 RASTER_BUFFER_PROVIDER_TYPE_GPU, |
396 RASTER_BUFFER_PROVIDER_TYPE_BITMAP)); | 396 RASTER_BUFFER_PROVIDER_TYPE_BITMAP)); |
397 | 397 |
398 } // namespace | 398 } // namespace |
399 } // namespace cc | 399 } // namespace cc |
OLD | NEW |