Index: cc/output/gl_renderer.cc |
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc |
index 7fcf54055fc5224ee0cd3853c2aeaf7d2f640fe2..d14feb6abf50053380bb4785909a3e12352e71bf 100644 |
--- a/cc/output/gl_renderer.cc |
+++ b/cc/output/gl_renderer.cc |
@@ -27,7 +27,6 @@ |
#include "cc/quads/stream_video_draw_quad.h" |
#include "cc/quads/texture_draw_quad.h" |
#include "cc/resources/layer_quad.h" |
-#include "cc/resources/raster_worker_pool.h" |
#include "cc/resources/scoped_resource.h" |
#include "cc/resources/texture_mailbox_deleter.h" |
#include "gpu/GLES2/gl2extchromium.h" |
@@ -80,44 +79,6 @@ class FallbackFence : public ResourceProvider::Fence { |
DISALLOW_COPY_AND_ASSIGN(FallbackFence); |
}; |
-class OnDemandRasterTaskImpl : public Task { |
- public: |
- OnDemandRasterTaskImpl(PicturePileImpl* picture_pile, |
- SkBitmap* bitmap, |
- gfx::Rect content_rect, |
- float contents_scale) |
- : picture_pile_(picture_pile), |
- bitmap_(bitmap), |
- content_rect_(content_rect), |
- contents_scale_(contents_scale) { |
- DCHECK(picture_pile_); |
- DCHECK(bitmap_); |
- } |
- |
- // Overridden from Task: |
- virtual void RunOnWorkerThread() OVERRIDE { |
- TRACE_EVENT0("cc", "OnDemandRasterTaskImpl::RunOnWorkerThread"); |
- SkCanvas canvas(*bitmap_); |
- |
- PicturePileImpl* picture_pile = picture_pile_->GetCloneForDrawingOnThread( |
- RasterWorkerPool::GetPictureCloneIndexForCurrentThread()); |
- DCHECK(picture_pile); |
- |
- picture_pile->RasterToBitmap(&canvas, content_rect_, contents_scale_, NULL); |
- } |
- |
- protected: |
- virtual ~OnDemandRasterTaskImpl() {} |
- |
- private: |
- PicturePileImpl* picture_pile_; |
- SkBitmap* bitmap_; |
- const gfx::Rect content_rect_; |
- const float contents_scale_; |
- |
- DISALLOW_COPY_AND_ASSIGN(OnDemandRasterTaskImpl); |
-}; |
- |
bool NeedsIOSurfaceReadbackWorkaround() { |
#if defined(OS_MACOSX) |
// This isn't strictly required in DumpRenderTree-mode when Mesa is used, |
@@ -1938,13 +1899,9 @@ void GLRenderer::DrawPictureQuad(const DrawingFrame* frame, |
quad->texture_format); |
} |
- // Create and run on-demand raster task for tile. |
- scoped_refptr<Task> on_demand_raster_task( |
- new OnDemandRasterTaskImpl(quad->picture_pile, |
- &on_demand_tile_raster_bitmap_, |
- quad->content_rect, |
- quad->contents_scale)); |
- client_->RunOnDemandRasterTask(on_demand_raster_task.get()); |
+ SkCanvas canvas(on_demand_tile_raster_bitmap_); |
+ quad->picture_pile->RasterToBitmap( |
+ &canvas, quad->content_rect, quad->contents_scale, NULL); |
uint8_t* bitmap_pixels = NULL; |
SkBitmap on_demand_tile_raster_bitmap_dest; |