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..850dac2994540d319c841953055d84eda6e6fab1 100644 |
--- a/cc/resources/image_raster_worker_pool.cc |
+++ b/cc/resources/image_raster_worker_pool.cc |
@@ -1,4 +1,4 @@ |
-// Copyright 2013 The Chromium Authors. All rights reserved. |
+// CopyrightOB 2013 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -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() { |