cc: Compute SurfacePropertyChanged without depending on owning layer

cc/layers/layer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/layer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 77 matching lines @@
       effect_tree_index_(EffectTree::kInvalidNodeId),
       clip_tree_index_(ClipTree::kInvalidNodeId),
       scroll_tree_index_(ScrollTree::kInvalidNodeId),
       property_tree_sequence_number_(-1),
       should_flatten_transform_from_property_tree_(false),
       draws_content_(false),
       use_local_transform_for_backface_visibility_(false),
       should_check_backface_visibility_(false),
       force_render_surface_for_testing_(false),
       subtree_property_changed_(false),
-      layer_property_changed_(false),
       may_contain_video_(false),
       safe_opaque_background_color_(0),
       draw_blend_mode_(SkXfermode::kSrcOver_Mode),
       num_unclipped_descendants_(0) {}
 
 Layer::~Layer() {
   // Our parent should be holding a reference to us so there should be no
   // way for us to be destroyed while we still have a parent.
   DCHECK(!parent());
   // Similarly we shouldn't have a layer tree host since it also keeps a
@@ skipping 357 matching lines @@
   inputs_.filters = filters;
   SetSubtreePropertyChanged();
   SetNeedsCommit();
 }
 
 void Layer::SetBackgroundFilters(const FilterOperations& filters) {
   DCHECK(IsPropertyChangeAllowed());
   if (inputs_.background_filters == filters)
     return;
   inputs_.background_filters = filters;
-  SetLayerPropertyChanged();
+  SetSubtreePropertyChanged();
   SetNeedsCommit();
 }
 
 void Layer::SetFiltersOrigin(const gfx::PointF& filters_origin) {
   DCHECK(IsPropertyChangeAllowed());
   if (inputs_.filters_origin == filters_origin)
     return;
   inputs_.filters_origin = filters_origin;
   SetSubtreePropertyChanged();
   SetNeedsCommit();
@@ skipping 678 matching lines @@
 #endif
 
   layer->SetTransformTreeIndex(transform_tree_index());
   layer->SetEffectTreeIndex(effect_tree_index());
   layer->SetClipTreeIndex(clip_tree_index());
   layer->SetScrollTreeIndex(scroll_tree_index());
   layer->set_offset_to_transform_parent(offset_to_transform_parent_);
   layer->SetDrawsContent(DrawsContent());
   // subtree_property_changed_ is propagated to all descendants while building
   // property trees. So, it is enough to check it only for the current layer.
-  if (subtree_property_changed_ || layer_property_changed_)
+  if (subtree_property_changed_)
     layer->NoteLayerPropertyChanged();
   layer->set_may_contain_video(may_contain_video_);
   layer->SetMasksToBounds(inputs_.masks_to_bounds);
   layer->set_main_thread_scrolling_reasons(
       inputs_.main_thread_scrolling_reasons);
   layer->SetNonFastScrollableRegion(inputs_.non_fast_scrollable_region);
   layer->SetTouchEventHandlerRegion(inputs_.touch_event_handler_region);
   layer->SetContentsOpaque(inputs_.contents_opaque);
   layer->SetPosition(inputs_.position);
   layer->set_should_flatten_transform_from_property_tree(
@@ skipping 24 matching lines @@
   // update_rect here. The LayerImpl's update_rect needs to accumulate (i.e.
   // union) any update changes that have occurred on the main thread.
   inputs_.update_rect.Union(layer->update_rect());
   layer->SetUpdateRect(inputs_.update_rect);
 
   layer->SetHasWillChangeTransformHint(has_will_change_transform_hint());
   layer->SetNeedsPushProperties();
 
   // Reset any state that should be cleared for the next update.
   subtree_property_changed_ = false;
-  layer_property_changed_ = false;
   inputs_.update_rect = gfx::Rect();
 
   layer_tree_->RemoveLayerShouldPushProperties(this);
 }
 
 void Layer::TakeCopyRequests(
     std::vector<std::unique_ptr<CopyOutputRequest>>* requests) {
   for (auto& it : inputs_.copy_requests) {
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner =
         layer_tree_host()->GetTaskRunnerProvider()->MainThreadTaskRunner();
@@ skipping 146 matching lines @@
   base->set_effect_tree_index(effect_tree_index_);
   base->set_clip_tree_index(clip_tree_index_);
   base->set_scroll_tree_index(scroll_tree_index_);
   Vector2dFToProto(offset_to_transform_parent_,
                    base->mutable_offset_to_transform_parent());
   base->set_double_sided(inputs_.double_sided);
   base->set_draws_content(draws_content_);
   base->set_may_contain_video(may_contain_video_);
   base->set_hide_layer_and_subtree(inputs_.hide_layer_and_subtree);
   base->set_subtree_property_changed(subtree_property_changed_);
-  base->set_layer_property_changed(layer_property_changed_);
 
   // TODO(nyquist): Add support for serializing FilterOperations for
   // |filters_| and |background_filters_|. See crbug.com/541321.
 
   base->set_masks_to_bounds(inputs_.masks_to_bounds);
   base->set_main_thread_scrolling_reasons(
       inputs_.main_thread_scrolling_reasons);
   RegionToProto(inputs_.non_fast_scrollable_region,
                 base->mutable_non_fast_scrollable_region());
   RegionToProto(inputs_.touch_event_handler_region,
@@ skipping 70 matching lines @@
   effect_tree_index_ = base.effect_tree_index();
   clip_tree_index_ = base.clip_tree_index();
   scroll_tree_index_ = base.scroll_tree_index();
   offset_to_transform_parent_ =
       ProtoToVector2dF(base.offset_to_transform_parent());
   inputs_.double_sided = base.double_sided();
   draws_content_ = base.draws_content();
   may_contain_video_ = base.may_contain_video();
   inputs_.hide_layer_and_subtree = base.hide_layer_and_subtree();
   subtree_property_changed_ = base.subtree_property_changed();
-  layer_property_changed_ = base.layer_property_changed();
   inputs_.masks_to_bounds = base.masks_to_bounds();
   inputs_.main_thread_scrolling_reasons = base.main_thread_scrolling_reasons();
   inputs_.non_fast_scrollable_region =
       RegionFromProto(base.non_fast_scrollable_region());
   inputs_.touch_event_handler_region =
       RegionFromProto(base.touch_event_handler_region());
   inputs_.contents_opaque = base.contents_opaque();
   inputs_.opacity = base.opacity();
   inputs_.blend_mode = SkXfermodeModeFromProto(base.blend_mode());
   inputs_.is_root_for_isolated_group = base.is_root_for_isolated_group();
@@ skipping 124 matching lines @@
     inputs_.client->didUpdateMainThreadScrollingReasons();
 }
 
 void Layer::SetSubtreePropertyChanged() {
   if (subtree_property_changed_)
     return;
   subtree_property_changed_ = true;
   SetNeedsPushProperties();
 }
 
-void Layer::SetLayerPropertyChanged() {
-  if (layer_property_changed_)
-    return;
-  layer_property_changed_ = true;
-  SetNeedsPushProperties();
-}
-
 void Layer::SetMayContainVideo(bool yes) {
   if (may_contain_video_ == yes)
     return;
   may_contain_video_ = yes;
   SetNeedsPushProperties();
 }
 
 bool Layer::FilterIsAnimating() const {
   return GetAnimationHost()->IsAnimatingFilterProperty(
       element_id(), GetElementTypeForAnimation());
@@ skipping 259 matching lines @@
   DCHECK_NE(transform_tree_index_, TransformTree::kInvalidNodeId);
   return draw_property_utils::ScreenSpaceTransform(
       this, layer_tree_->property_trees()->transform_tree);
 }
 
 LayerTree* Layer::GetLayerTree() const {
   return layer_tree_;
 }
 
 }  // namespace cc