| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/damage_tracker.h" | 5 #include "cc/trees/damage_tracker.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 // | 107 // |
| 108 | 108 |
| 109 for (RenderSurfaceImpl* render_surface : render_surface_list) { | 109 for (RenderSurfaceImpl* render_surface : render_surface_list) { |
| 110 render_surface->damage_tracker()->PrepareForUpdate(); | 110 render_surface->damage_tracker()->PrepareForUpdate(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 EffectTree& effect_tree = layer_tree_impl->property_trees()->effect_tree; | 113 EffectTree& effect_tree = layer_tree_impl->property_trees()->effect_tree; |
| 114 int current_target_effect_id = EffectTree::kContentsRootNodeId; | 114 int current_target_effect_id = EffectTree::kContentsRootNodeId; |
| 115 DCHECK(effect_tree.GetRenderSurface(current_target_effect_id)); | 115 DCHECK(effect_tree.GetRenderSurface(current_target_effect_id)); |
| 116 for (LayerImpl* layer : *layer_tree_impl) { | 116 for (LayerImpl* layer : *layer_tree_impl) { |
| 117 if (!layer->is_drawn_render_surface_layer_list_member()) | 117 if (!layer->contributes_to_drawn_render_surface()) |
| 118 continue; | 118 continue; |
| 119 | 119 |
| 120 int next_target_effect_id = layer->render_target_effect_tree_index(); | 120 int next_target_effect_id = layer->render_target_effect_tree_index(); |
| 121 if (next_target_effect_id != current_target_effect_id) { | 121 if (next_target_effect_id != current_target_effect_id) { |
| 122 int lowest_common_ancestor_id = | 122 int lowest_common_ancestor_id = |
| 123 effect_tree.LowestCommonAncestorWithRenderSurface( | 123 effect_tree.LowestCommonAncestorWithRenderSurface( |
| 124 current_target_effect_id, next_target_effect_id); | 124 current_target_effect_id, next_target_effect_id); |
| 125 while (current_target_effect_id != lowest_common_ancestor_id) { | 125 while (current_target_effect_id != lowest_common_ancestor_id) { |
| 126 // Moving to a non-descendant target surface. This implies that the | 126 // Moving to a non-descendant target surface. This implies that the |
| 127 // current target doesn't have any more contributors, since only | 127 // current target doesn't have any more contributors, since only |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 } | 472 } |
| 473 | 473 |
| 474 rect->set_x(x_); | 474 rect->set_x(x_); |
| 475 rect->set_y(y_); | 475 rect->set_y(y_); |
| 476 rect->set_width(width.ValueOrDie()); | 476 rect->set_width(width.ValueOrDie()); |
| 477 rect->set_height(height.ValueOrDie()); | 477 rect->set_height(height.ValueOrDie()); |
| 478 return true; | 478 return true; |
| 479 } | 479 } |
| 480 | 480 |
| 481 } // namespace cc | 481 } // namespace cc |
| OLD | NEW |