| 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..0767c68704f7fa5bbab5def4c4c6f6d496a22cd2 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "cc/trees/layer_tree_impl.h"
|
|
|
| +#include <limits>
|
| +
|
| #include "base/debug/trace_event.h"
|
| #include "cc/animation/keyframed_animation_curve.h"
|
| #include "cc/animation/scrollbar_animation_controller.h"
|
| @@ -97,7 +99,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),
|
| + render_surface_layer_list_id_(0) {
|
| +}
|
|
|
| LayerTreeImpl::~LayerTreeImpl() {
|
| // Need to explicitly clear the tree prior to destroying this so that
|
| @@ -457,6 +461,8 @@ void LayerTreeImpl::UpdateDrawProperties() {
|
| page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer();
|
| bool can_render_to_separate_surface =
|
| !output_surface()->ForcedDrawToSoftwareDevice();
|
| +
|
| + ++render_surface_layer_list_id_;
|
| LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
|
| root_layer(),
|
| DrawViewportSize(),
|
| @@ -468,7 +474,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_,
|
| + render_surface_layer_list_id_);
|
| LayerTreeHostCommon::CalculateDrawProperties(&inputs);
|
| }
|
|
|
|
|