Index: cc/trees/layer_tree_impl.cc |
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc |
index 1014a3f8c5c16446a1752579be7d0061ceddec97..421d8946eac3385336e7d28dbeda0117c8d07992 100644 |
--- a/cc/trees/layer_tree_impl.cc |
+++ b/cc/trees/layer_tree_impl.cc |
@@ -97,7 +97,9 @@ LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl) |
viewport_size_invalid_(false), |
needs_update_draw_properties_(true), |
needs_full_tree_sync_(true), |
- next_activation_forces_redraw_(false) {} |
+ next_activation_forces_redraw_(false), |
+ calculate_draw_properties_count_(0u) { |
+} |
LayerTreeImpl::~LayerTreeImpl() { |
// Need to explicitly clear the tree prior to destroying this so that |
@@ -457,6 +459,7 @@ void LayerTreeImpl::UpdateDrawProperties() { |
page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer(); |
bool can_render_to_separate_surface = |
!output_surface()->ForcedDrawToSoftwareDevice(); |
+ ++calculate_draw_properties_count_; |
danakj
2014/05/02 23:45:26
Make this skip 0 on wraparound please.
vmpstr
2014/05/05 18:46:43
Done.
|
LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( |
root_layer(), |
DrawViewportSize(), |
@@ -468,7 +471,8 @@ void LayerTreeImpl::UpdateDrawProperties() { |
settings().can_use_lcd_text, |
can_render_to_separate_surface, |
settings().layer_transforms_should_scale_layer_contents, |
- &render_surface_layer_list_); |
+ &render_surface_layer_list_, |
+ calculate_draw_properties_count_); |
LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
} |
@@ -490,6 +494,7 @@ void LayerTreeImpl::UpdateDrawProperties() { |
++it) { |
if (!it.represents_itself()) |
continue; |
+ |
LayerImpl* layer = *it; |
layer->UpdateTilePriorities(); |