OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/output/software_renderer.h" | 5 #include "cc/output/software_renderer.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
10 #include "cc/base/render_surface_filters.h" | 10 #include "cc/base/render_surface_filters.h" |
| 11 #include "cc/base/scale_translate2d.h" |
11 #include "cc/output/copy_output_request.h" | 12 #include "cc/output/copy_output_request.h" |
12 #include "cc/output/output_surface.h" | 13 #include "cc/output/output_surface.h" |
13 #include "cc/output/output_surface_frame.h" | 14 #include "cc/output/output_surface_frame.h" |
14 #include "cc/output/renderer_settings.h" | 15 #include "cc/output/renderer_settings.h" |
15 #include "cc/output/software_output_device.h" | 16 #include "cc/output/software_output_device.h" |
16 #include "cc/quads/debug_border_draw_quad.h" | 17 #include "cc/quads/debug_border_draw_quad.h" |
17 #include "cc/quads/picture_draw_quad.h" | 18 #include "cc/quads/picture_draw_quad.h" |
18 #include "cc/quads/render_pass_draw_quad.h" | 19 #include "cc/quads/render_pass_draw_quad.h" |
19 #include "cc/quads/solid_color_draw_quad.h" | 20 #include "cc/quads/solid_color_draw_quad.h" |
20 #include "cc/quads/texture_draw_quad.h" | 21 #include "cc/quads/texture_draw_quad.h" |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 // cases and fall back to a persistent bitmap backing | 356 // cases and fall back to a persistent bitmap backing |
356 // (http://crbug.com/280374). | 357 // (http://crbug.com/280374). |
357 // TODO(vmpstr): Fold this canvas into playback and have raster source | 358 // TODO(vmpstr): Fold this canvas into playback and have raster source |
358 // accept a set of settings on playback that will determine which canvas to | 359 // accept a set of settings on playback that will determine which canvas to |
359 // apply. (http://crbug.com/594679) | 360 // apply. (http://crbug.com/594679) |
360 skia::OpacityFilterCanvas filtered_canvas(current_canvas_, | 361 skia::OpacityFilterCanvas filtered_canvas(current_canvas_, |
361 quad->shared_quad_state->opacity, | 362 quad->shared_quad_state->opacity, |
362 disable_image_filtering); | 363 disable_image_filtering); |
363 quad->raster_source->PlaybackToCanvas( | 364 quad->raster_source->PlaybackToCanvas( |
364 &filtered_canvas, canvas_color_space, quad->content_rect, | 365 &filtered_canvas, canvas_color_space, quad->content_rect, |
365 quad->content_rect, quad->contents_scale, playback_settings); | 366 quad->content_rect, |
| 367 ScaleTranslate2d(quad->contents_scale, gfx::Vector2dF()), |
| 368 playback_settings); |
366 } else { | 369 } else { |
367 quad->raster_source->PlaybackToCanvas( | 370 quad->raster_source->PlaybackToCanvas( |
368 current_canvas_, canvas_color_space, quad->content_rect, | 371 current_canvas_, canvas_color_space, quad->content_rect, |
369 quad->content_rect, quad->contents_scale, playback_settings); | 372 quad->content_rect, |
| 373 ScaleTranslate2d(quad->contents_scale, gfx::Vector2dF()), |
| 374 playback_settings); |
370 } | 375 } |
371 } | 376 } |
372 | 377 |
373 void SoftwareRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad) { | 378 void SoftwareRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad) { |
374 gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional( | 379 gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional( |
375 QuadVertexRect(), gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect)); | 380 QuadVertexRect(), gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect)); |
376 current_paint_.setColor(quad->color); | 381 current_paint_.setColor(quad->color); |
377 current_paint_.setAlpha(quad->shared_quad_state->opacity * | 382 current_paint_.setAlpha(quad->shared_quad_state->opacity * |
378 SkColorGetA(quad->color)); | 383 SkColorGetA(quad->color)); |
379 current_canvas_->drawRect(gfx::RectFToSkRect(visible_quad_vertex_rect), | 384 current_canvas_->drawRect(gfx::RectFToSkRect(visible_quad_vertex_rect), |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
723 ApplyImageFilter(filter.get(), quad, backdrop_bitmap, nullptr); | 728 ApplyImageFilter(filter.get(), quad, backdrop_bitmap, nullptr); |
724 | 729 |
725 if (!filter_backdrop_image) | 730 if (!filter_backdrop_image) |
726 return nullptr; | 731 return nullptr; |
727 | 732 |
728 return filter_backdrop_image->makeShader(content_tile_mode, content_tile_mode, | 733 return filter_backdrop_image->makeShader(content_tile_mode, content_tile_mode, |
729 &filter_backdrop_transform); | 734 &filter_backdrop_transform); |
730 } | 735 } |
731 | 736 |
732 } // namespace cc | 737 } // namespace cc |
OLD | NEW |