diff options
| author | vmpstr <vmpstr@chromium.org> | 2014-11-10 10:36:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-10 18:37:09 +0000 |
| commit | cd2b5e0dd51ccfdfe4df295d8b208123994e5677 (patch) | |
| tree | 3af88d62cbec0770d453909c96d264e91841649a /cc/output | |
| parent | 519ee2be074c24726eaf011ff0c0d4cb14360657 (diff) | |
| download | chromium_src-cd2b5e0dd51ccfdfe4df295d8b208123994e5677.zip chromium_src-cd2b5e0dd51ccfdfe4df295d8b208123994e5677.tar.gz chromium_src-cd2b5e0dd51ccfdfe4df295d8b208123994e5677.tar.bz2 | |
cc: Remove references to picture pile impl from more areas.
This patch augments raster source interface to include all things that
are accessed from picture pile impl. It further removes picture pile
references from places where they can be removed.
R=danakj, enne
BUG=430260
Review URL: https://codereview.chromium.org/707193007
Cr-Commit-Position: refs/heads/master@{#303499}
Diffstat (limited to 'cc/output')
| -rw-r--r-- | cc/output/gl_renderer.cc | 4 | ||||
| -rw-r--r-- | cc/output/software_renderer.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 214b989..75dcfe8 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -1983,8 +1983,8 @@ void GLRenderer::DrawPictureQuad(const DrawingFrame* frame, } SkCanvas canvas(on_demand_tile_raster_bitmap_); - quad->picture_pile->PlaybackToCanvas(&canvas, quad->content_rect, - quad->contents_scale); + quad->raster_source->PlaybackToCanvas(&canvas, quad->content_rect, + quad->contents_scale); uint8_t* bitmap_pixels = NULL; SkBitmap on_demand_tile_raster_bitmap_dest; diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc index 06f1851..442cd8d 100644 --- a/cc/output/software_renderer.cc +++ b/cc/output/software_renderer.cc @@ -350,8 +350,8 @@ void SoftwareRenderer::DrawPictureQuad(const DrawingFrame* frame, TRACE_EVENT0("cc", "SoftwareRenderer::DrawPictureQuad"); - quad->picture_pile->RasterDirect(current_canvas_, quad->content_rect, - quad->contents_scale); + quad->raster_source->PlaybackToSharedCanvas( + current_canvas_, quad->content_rect, quad->contents_scale); current_canvas_->setDrawFilter(NULL); } |