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/layers/delegated_renderer_layer_impl.h" | 5 #include "cc/layers/delegated_renderer_layer_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/containers/hash_tables.h" | 11 #include "base/containers/hash_tables.h" |
12 #include "cc/base/math_util.h" | 12 #include "cc/base/math_util.h" |
13 #include "cc/layers/append_quads_data.h" | 13 #include "cc/layers/append_quads_data.h" |
14 #include "cc/layers/render_pass_sink.h" | 14 #include "cc/layers/render_pass_sink.h" |
15 #include "cc/output/delegated_frame_data.h" | 15 #include "cc/output/delegated_frame_data.h" |
16 #include "cc/quads/render_pass_draw_quad.h" | 16 #include "cc/quads/render_pass_draw_quad.h" |
17 #include "cc/quads/solid_color_draw_quad.h" | 17 #include "cc/quads/solid_color_draw_quad.h" |
18 #include "cc/trees/layer_tree_impl.h" | 18 #include "cc/trees/layer_tree_impl.h" |
19 #include "cc/trees/occlusion.h" | 19 #include "cc/trees/occlusion.h" |
| 20 #include "ui/gfx/geometry/rect_conversions.h" |
20 | 21 |
21 namespace cc { | 22 namespace cc { |
22 | 23 |
23 DelegatedRendererLayerImpl::DelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, | 24 DelegatedRendererLayerImpl::DelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, |
24 int id) | 25 int id) |
25 : LayerImpl(tree_impl, id), | 26 : LayerImpl(tree_impl, id), |
26 have_render_passes_to_push_(false), | 27 have_render_passes_to_push_(false), |
27 inverse_device_scale_factor_(1.0f), | 28 inverse_device_scale_factor_(1.0f), |
28 child_id_(0), | 29 child_id_(0), |
29 own_child_id_(false) { | 30 own_child_id_(false) { |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 | 143 |
143 inverse_device_scale_factor_ = 1.0f / frame_data->device_scale_factor; | 144 inverse_device_scale_factor_ = 1.0f / frame_data->device_scale_factor; |
144 // Display size is already set so we can compute what the damage rect | 145 // Display size is already set so we can compute what the damage rect |
145 // will be in layer space. The damage may exceed the visible portion of | 146 // will be in layer space. The damage may exceed the visible portion of |
146 // the frame, so intersect the damage to the layer's bounds. | 147 // the frame, so intersect the damage to the layer's bounds. |
147 RenderPass* new_root_pass = render_pass_list.back(); | 148 RenderPass* new_root_pass = render_pass_list.back(); |
148 gfx::Size frame_size = new_root_pass->output_rect.size(); | 149 gfx::Size frame_size = new_root_pass->output_rect.size(); |
149 gfx::RectF damage_in_layer = damage_in_frame; | 150 gfx::RectF damage_in_layer = damage_in_frame; |
150 damage_in_layer.Scale(inverse_device_scale_factor_); | 151 damage_in_layer.Scale(inverse_device_scale_factor_); |
151 SetUpdateRect(gfx::IntersectRects( | 152 SetUpdateRect(gfx::IntersectRects( |
152 gfx::UnionRects(update_rect(), damage_in_layer), gfx::Rect(bounds()))); | 153 gfx::UnionRects(update_rect(), gfx::ToEnclosingRect(damage_in_layer)), |
| 154 gfx::Rect(bounds()))); |
153 | 155 |
154 SetRenderPasses(&render_pass_list); | 156 SetRenderPasses(&render_pass_list); |
155 have_render_passes_to_push_ = true; | 157 have_render_passes_to_push_ = true; |
156 } | 158 } |
157 | 159 |
158 void DelegatedRendererLayerImpl::SetRenderPasses( | 160 void DelegatedRendererLayerImpl::SetRenderPasses( |
159 RenderPassList* render_passes_in_draw_order) { | 161 RenderPassList* render_passes_in_draw_order) { |
160 ClearRenderPasses(); | 162 ClearRenderPasses(); |
161 | 163 |
162 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) { | 164 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) { |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 if (own_child_id_) { | 493 if (own_child_id_) { |
492 ResourceProvider* provider = layer_tree_impl()->resource_provider(); | 494 ResourceProvider* provider = layer_tree_impl()->resource_provider(); |
493 provider->DestroyChild(child_id_); | 495 provider->DestroyChild(child_id_); |
494 } | 496 } |
495 | 497 |
496 resources_.clear(); | 498 resources_.clear(); |
497 child_id_ = 0; | 499 child_id_ = 0; |
498 } | 500 } |
499 | 501 |
500 } // namespace cc | 502 } // namespace cc |
OLD | NEW |