| Index: cc/resources/image_raster_worker_pool.cc
|
| diff --git a/cc/resources/image_raster_worker_pool.cc b/cc/resources/image_raster_worker_pool.cc
|
| index 9862484ccf0aa4945cd94886650505bf47152173..2dfc0907a672a0fb63d582d5a0f0baf411dd4141 100644
|
| --- a/cc/resources/image_raster_worker_pool.cc
|
| +++ b/cc/resources/image_raster_worker_pool.cc
|
| @@ -34,14 +34,10 @@ class ImageWorkerPoolTaskImpl : public internal::WorkerPoolTask {
|
| if (!buffer_)
|
| return;
|
|
|
| - SkBitmap bitmap;
|
| - bitmap.setConfig(SkBitmap::kARGB_8888_Config,
|
| - task_->resource()->size().width(),
|
| - task_->resource()->size().height(),
|
| - stride_);
|
| - bitmap.setPixels(buffer_);
|
| - SkBitmapDevice device(bitmap);
|
| - task_->RunOnWorkerThread(&device, thread_index);
|
| + task_->RunOnWorkerThread(thread_index,
|
| + buffer_,
|
| + task_->resource()->size(),
|
| + stride_);
|
| }
|
| virtual void CompleteOnOriginThread() OVERRIDE {
|
| reply_.Run(!HasFinishedRunning());
|
| @@ -156,8 +152,9 @@ void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
|
| "state", TracedValue::FromValue(StateAsValue().release()));
|
| }
|
|
|
| -GLenum ImageRasterWorkerPool::GetResourceFormat() const {
|
| - return GL_RGBA; // Only format supported by CHROMIUM_map_image
|
| +ResourceFormat ImageRasterWorkerPool::GetResourceFormat() const {
|
| + // Only format supported by CHROMIUM_map_image
|
| + return RGBA_8888;
|
| }
|
|
|
| void ImageRasterWorkerPool::OnRasterTasksFinished() {
|
|
|