| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index 14ffa6f826fc2fd6c41349fec759bcf9a0c50a3c..70a4c5a6ed82fabb42fbc3943cd972f70bc3e828 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -63,6 +63,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
|
| force_render_surface_(false),
|
| transform_is_invertible_(true),
|
| is_container_for_fixed_position_layers_(false),
|
| + includes_first_paint_invalidation_(false),
|
| background_color_(0),
|
| opacity_(1.0),
|
| blend_mode_(SkXfermode::kSrcOver_Mode),
|
| @@ -166,8 +167,7 @@ void LayerImpl::SetScrollParent(LayerImpl* parent) {
|
| SetNeedsPushProperties();
|
| }
|
|
|
| -void LayerImpl::SetDebugInfo(
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> other) {
|
| +void LayerImpl::SetDebugInfo(scoped_refptr<LayerDebugInfo> other) {
|
| debug_info_ = other;
|
| SetNeedsPushProperties();
|
| }
|
| @@ -593,6 +593,8 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
|
| update_rect_.Union(layer->update_rect());
|
| layer->SetUpdateRect(update_rect_);
|
|
|
| + layer->SetIncludesFirstPaintInvalidation(includes_first_paint_invalidation());
|
| +
|
| layer->SetStackingOrderChanged(stacking_order_changed_);
|
| layer->SetDebugInfo(debug_info_);
|
|
|
|
|