Index: cc/resources/pixel_buffer_raster_worker_pool.cc |
diff --git a/cc/resources/pixel_buffer_raster_worker_pool.cc b/cc/resources/pixel_buffer_raster_worker_pool.cc |
index a7d9b31e1ec573b7140f14b836e9cae4905b0820..e831b3a4424cca8d2dae0acfb006c76ba741ff3f 100644 |
--- a/cc/resources/pixel_buffer_raster_worker_pool.cc |
+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc |
@@ -41,13 +41,10 @@ class PixelBufferWorkerPoolTaskImpl : public internal::WorkerPoolTask { |
needs_upload_ = true; |
return; |
} |
- SkBitmap bitmap; |
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, |
- task_->resource()->size().width(), |
- task_->resource()->size().height()); |
- bitmap.setPixels(buffer_); |
- SkBitmapDevice device(bitmap); |
- needs_upload_ = task_->RunOnWorkerThread(&device, thread_index); |
+ needs_upload_ = task_->RunOnWorkerThread(thread_index, |
+ buffer_, |
+ task_->resource()->size(), |
+ 0); |
} |
virtual void CompleteOnOriginThread() OVERRIDE { |
// |needs_upload_| must be be false if task didn't run. |
@@ -219,8 +216,8 @@ void PixelBufferRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) { |
"state", TracedValue::FromValue(StateAsValue().release())); |
} |
-GLenum PixelBufferRasterWorkerPool::GetResourceFormat() const { |
- return resource_provider()->best_texture_format(); |
+ResourceFormat PixelBufferRasterWorkerPool::GetResourceFormat() const { |
+ return resource_provider()->memory_efficient_texture_format(); |
} |
void PixelBufferRasterWorkerPool::CheckForCompletedTasks() { |