cc : Stop pushing properties not used by LayerImpl to LayerImpl (3)

cc/layers/layer_impl.h

 // Copyright 2011 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 142 matching lines @@
 
   bool is_clipped() const { return draw_properties_.is_clipped; }
 
   void UpdatePropertyTreeTransform();
   void UpdatePropertyTreeTransformIsAnimated(bool is_animated);
   void UpdatePropertyTreeOpacity();
   void UpdatePropertyTreeScrollOffset();
 
   // For compatibility with Layer.
   bool has_render_surface() const { return !!render_surface(); }
-  void SetNumDescendantsThatDrawContent(int num_descendants);
   void SetClipParent(LayerImpl* ancestor);
 
   LayerImpl* clip_parent() {
     return clip_parent_;
   }
 
   void SetClipChildren(std::set<LayerImpl*>* children);
 
   std::set<LayerImpl*>* clip_children() { return clip_children_.get(); }
   const std::set<LayerImpl*>* clip_children() const {
@@ skipping 51 matching lines @@
                                      gfx::Size* resource_size) const;
 
   virtual void NotifyTileStateChanged(const Tile* tile) {}
 
   virtual ScrollbarLayerImplBase* ToScrollbarLayer();
 
   // Returns true if this layer has content to draw.
   void SetDrawsContent(bool draws_content);
   bool DrawsContent() const { return draws_content_; }
 
-  int NumDescendantsThatDrawContent() const;
   void SetHideLayerAndSubtree(bool hide);
   bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
 
   LayerImplTestProperties* test_properties() {
     if (!test_properties_)
       test_properties_.reset(new LayerImplTestProperties());
     return test_properties_.get();
   }
 
   void SetBackgroundColor(SkColor background_color);
@@ skipping 39 matching lines @@
     if (draw_blend_mode_ == blend_mode)
       return;
     draw_blend_mode_ = blend_mode;
     SetNeedsPushProperties();
   }
   SkXfermode::Mode draw_blend_mode() const { return draw_blend_mode_; }
   bool uses_default_blend_mode() const {
     return blend_mode_ == SkXfermode::kSrcOver_Mode;
   }
 
-  void SetIsRootForIsolatedGroup(bool root);
-  bool is_root_for_isolated_group() const {
-    return is_root_for_isolated_group_;
-  }
-
   void SetPosition(const gfx::PointF& position);
   gfx::PointF position() const { return position_; }
 
-  void SetIsContainerForFixedPositionLayers(bool container) {
-    is_container_for_fixed_position_layers_ = container;
-  }
-  // This is a non-trivial function in Layer.
-  bool IsContainerForFixedPositionLayers() const {
-    return is_container_for_fixed_position_layers_;
-  }
-
   bool IsAffectedByPageScale() const;
 
   gfx::Vector2dF FixedContainerSizeDelta() const;
 
-  void SetPositionConstraint(const LayerPositionConstraint& constraint) {
-    position_constraint_ = constraint;
-  }
-  const LayerPositionConstraint& position_constraint() const {
-    return position_constraint_;
-  }
-
-  void SetShouldFlattenTransform(bool flatten);
-  bool should_flatten_transform() const { return should_flatten_transform_; }
-
   bool Is3dSorted() const { return sorting_context_id_ != 0; }
 
   void SetUseParentBackfaceVisibility(bool use) {
     use_parent_backface_visibility_ = use;
   }
   bool use_parent_backface_visibility() const {
     return use_parent_backface_visibility_;
   }
 
   void SetUseLocalTransformForBackfaceVisibility(bool use_local) {
@@ skipping 119 matching lines @@
     return touch_event_handler_region_;
   }
 
   void SetTransform(const gfx::Transform& transform);
   const gfx::Transform& transform() const { return transform_; }
   bool TransformIsAnimating() const;
   bool HasPotentiallyRunningTransformAnimation() const;
   bool TransformIsAnimatingOnImplOnly() const;
   bool HasOnlyTranslationTransforms() const;
   bool AnimationsPreserveAxisAlignment() const;
-  void SetTransformAndInvertibility(const gfx::Transform& transform,
-                                    bool transform_is_invertible);
-  bool transform_is_invertible() const { return transform_is_invertible_; }
 
   bool MaximumTargetScale(float* max_scale) const;
   bool AnimationStartScale(float* start_scale) const;
 
   // This includes all animations, even those that are finished but haven't yet
   // been deleted.
   bool HasAnyAnimationTargetingProperty(TargetProperty::Type property) const;
 
   bool HasFilterAnimationThatInflatesBounds() const;
   bool HasTransformAnimationThatInflatesBounds() const;
@@ skipping 164 matching lines @@
 
   // Properties synchronized from the associated Layer.
   gfx::Size bounds_;
   int scroll_clip_layer_id_;
 
   gfx::Vector2dF offset_to_transform_parent_;
   uint32_t main_thread_scrolling_reasons_;
 
   bool user_scrollable_horizontal_ : 1;
   bool user_scrollable_vertical_ : 1;
-  bool should_flatten_transform_ : 1;
   bool should_flatten_transform_from_property_tree_ : 1;
 
   // Tracks if drawing-related properties have changed since last redraw.
   bool layer_property_changed_ : 1;
 
   bool masks_to_bounds_ : 1;
   bool contents_opaque_ : 1;
-  bool is_root_for_isolated_group_ : 1;
   bool use_parent_backface_visibility_ : 1;
   bool use_local_transform_for_backface_visibility_ : 1;
   bool should_check_backface_visibility_ : 1;
   bool draws_content_ : 1;
   bool hide_layer_and_subtree_ : 1;
 
-  // Cache transform_'s invertibility.
-  bool transform_is_invertible_ : 1;
-
-  // Set for the layer that other layers are fixed to.
-  bool is_container_for_fixed_position_layers_ : 1;
-
   bool is_affected_by_page_scale_ : 1;
 
   // This is true if and only if the layer was ever ready since it last animated
   // (all content was complete).
   bool was_ever_ready_since_last_transform_animation_ : 1;
 
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   SkColor background_color_;
   SkColor safe_opaque_background_color_;
 
   float opacity_;
   SkXfermode::Mode blend_mode_;
   // draw_blend_mode may be different than blend_mode_,
   // when a RenderSurface re-parents the layer's blend_mode.
   SkXfermode::Mode draw_blend_mode_;
   gfx::PointF position_;
   gfx::Transform transform_;
 
-  LayerPositionConstraint position_constraint_;
-
-  int num_descendants_that_draw_content_;
-
   gfx::Rect clip_rect_in_target_space_;
   int transform_tree_index_;
   int effect_tree_index_;
   int clip_tree_index_;
   int scroll_tree_index_;
 
   FilterOperations filters_;
   FilterOperations background_filters_;
 
  protected:
@@ skipping 33 matching lines @@
   bool scrolls_drawn_descendant_;
   // If true, the layer or one of its descendants has a touch handler.
   bool layer_or_descendant_has_touch_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_