| Index: cc/resources/raster_worker_pool_unittest.cc
|
| diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
|
| index ab55bf3a46e1776362cbf81596ae2e9444a11147..61cb324f772d575e77974dcd08a5dfdd647c47a6 100644
|
| --- a/cc/resources/raster_worker_pool_unittest.cc
|
| +++ b/cc/resources/raster_worker_pool_unittest.cc
|
| @@ -35,8 +35,10 @@ class TestRasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
|
| did_raster_(false) {}
|
|
|
| // Overridden from internal::WorkerPoolTask:
|
| - virtual bool RunOnWorkerThread(SkBaseDevice* device, unsigned thread_index)
|
| - OVERRIDE {
|
| + virtual bool RunOnWorkerThread(unsigned thread_index,
|
| + void* buffer,
|
| + gfx::Size size,
|
| + int stride) OVERRIDE {
|
| did_raster_ = true;
|
| return true;
|
| }
|
| @@ -65,8 +67,8 @@ class RasterWorkerPoolTest : public testing::Test,
|
| output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
|
| CHECK(output_surface_->BindToClient(&output_surface_client_));
|
|
|
| - resource_provider_ = ResourceProvider::Create(output_surface_.get(),
|
| - 0).Pass();
|
| + resource_provider_ =
|
| + ResourceProvider::Create(output_surface_.get(), 0, false).Pass();
|
| }
|
| virtual ~RasterWorkerPoolTest() {
|
| resource_provider_.reset();
|
| @@ -104,8 +106,11 @@ class RasterWorkerPoolTest : public testing::Test,
|
| raster_worker_pool_ = ImageRasterWorkerPool::Create(
|
| resource_provider(), 1);
|
| } else {
|
| - raster_worker_pool_ = PixelBufferRasterWorkerPool::Create(
|
| - resource_provider(), 1, std::numeric_limits<size_t>::max());
|
| + raster_worker_pool_ =
|
| + PixelBufferRasterWorkerPool::Create(
|
| + resource_provider(),
|
| + 1,
|
| + std::numeric_limits<size_t>::max());
|
| }
|
|
|
| raster_worker_pool_->SetClient(this);
|
| @@ -155,7 +160,7 @@ class RasterWorkerPoolTest : public testing::Test,
|
|
|
| scoped_ptr<ScopedResource> resource(
|
| ScopedResource::create(resource_provider()));
|
| - resource->Allocate(size, GL_RGBA, ResourceProvider::TextureUsageAny);
|
| + resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
|
| const Resource* const_resource = resource.get();
|
|
|
| RasterWorkerPool::Task::Set empty;
|
|
|