More aggressive out-of-lining.

Author: flar

flow/layers/container_layer.cc

@@ -20,7 +20,22 @@ void ContainerLayer::Add(std::shared_ptr<Layer> layer) {
   }
 }
 
-void ContainerLayer::UpdateChildReadback(Layer* layer) {
+void ContainerLayer::ClearChildren() {
+  layers_.clear();
+  if (child_needs_screen_readback_) {
+    child_needs_screen_readback_ = false;
+    UpdateTreeReadsSurface();
+  }
+}
+
+void ContainerLayer::set_renders_to_save_layer(bool protects) {
+  if (renders_to_save_layer_ != protects) {
+    renders_to_save_layer_ = protects;
+    UpdateTreeReadsSurface();
+  }
+}
+
+void ContainerLayer::UpdateChildReadback(const Layer* layer) {
   if (child_needs_screen_readback_ == layer->tree_reads_surface()) {
     return;
   }
@@ -39,7 +54,7 @@ void ContainerLayer::UpdateChildReadback(Layer* layer) {
   UpdateTreeReadsSurface();
 }
 
-bool ContainerLayer::ComputeTreeReadsSurface() {
+bool ContainerLayer::ComputeTreeReadsSurface() const {
   return layer_reads_surface() ||
          (!renders_to_save_layer_ && child_needs_screen_readback_);
 }

flow/layers/container_layer.h

@@ -27,15 +27,15 @@ class ContainerLayer : public Layer {
 
   // Called when the layer, which must be a child of this container,
   // changes its tree_reads_surface() result.
-  void UpdateChildReadback(Layer* layer);
+  void UpdateChildReadback(const Layer* layer);
 
  protected:
   void PrerollChildren(PrerollContext* context,
                        const SkMatrix& child_matrix,
                        SkRect* child_paint_bounds);
   void PaintChildren(PaintContext& context) const;
 
-  virtual bool ComputeTreeReadsSurface() override;
+  virtual bool ComputeTreeReadsSurface() const override;
 
 #if defined(OS_FUCHSIA)
   void UpdateSceneChildren(SceneUpdateContext& context);
@@ -48,21 +48,10 @@ class ContainerLayer : public Layer {
   // children perform non-associative rendering. Those children
   // will now be performing those operations on the SaveLayer
   // rather than the layer that this container renders onto.
-  void set_renders_to_save_layer(bool protects) {
-    if (renders_to_save_layer_ != protects) {
-      renders_to_save_layer_ = protects;
-      UpdateTreeReadsSurface();
-    }
-  }
+  void set_renders_to_save_layer(bool protects);
 
   // For OpacityLayer to restructure to have a single child.
-  void ClearChildren() {
-    layers_.clear();
-    if (child_needs_screen_readback_) {
-      child_needs_screen_readback_ = false;
-      UpdateTreeReadsSurface();
-    }
-  }
+  void ClearChildren();
 
  private:
   std::vector<std::shared_ptr<Layer>> layers_;

flow/layers/layer.cc

@@ -29,7 +29,14 @@ uint64_t Layer::NextUniqueID() {
   return id;
 }
 
-bool Layer::ComputeTreeReadsSurface() {
+void Layer::set_layer_reads_surface(bool reads) {
+  if (layer_reads_surface_ != reads) {
+    layer_reads_surface_ = reads;
+    UpdateTreeReadsSurface();
+  }
+}
+
+bool Layer::ComputeTreeReadsSurface() const {
   return layer_reads_surface_;
 }
 

flow/layers/layer.h

@@ -155,30 +155,26 @@ class Layer {
   // see Layer::set_layer_reads_surface()
   // see ContainerLayer::set_renders_to_save_layer()
   // see ContainerLayer::UpdateChildReadback()
-  bool tree_reads_surface() { return tree_reads_surface_; }
+  bool tree_reads_surface() const { return tree_reads_surface_; }
 
   uint64_t unique_id() const { return unique_id_; }
 
  protected:
   // Compute a new value for tree_reads_surface_ from all of the various
   // properties of this layer.
-  virtual bool ComputeTreeReadsSurface();
+  // Used by UpdateTreeReadsSurface()
+  virtual bool ComputeTreeReadsSurface() const;
 
   // Update the tree_reads_surface_ value and propagate changes to
   // ancestors if needed.
+  // Uses ComputeTreeReadsSurface()
   void UpdateTreeReadsSurface();
 
   // True iff the layer itself (not a child or other descendant) performs
-  // an operation which must read back from the surface on which it is
-  // rendered.
-  bool layer_reads_surface() { return layer_reads_surface_; }
-
-  void set_layer_reads_surface(bool reads) {
-    if (layer_reads_surface_ != reads) {
-      layer_reads_surface_ = reads;
-      UpdateTreeReadsSurface();
-    }
-  }
+  // an operation which reads from the surface on which it is rendered.
+  bool layer_reads_surface() const { return layer_reads_surface_; }
+
+  void set_layer_reads_surface(bool reads);
 
  private:
   ContainerLayer* parent_;

flow/layers/layer_tree.h

@@ -43,7 +43,7 @@ class LayerTree {
     root_layer_ = std::move(root_layer);
   }
 
-  bool root_needs_screen_readback() {
+  bool root_needs_screen_readback() const {
     return root_layer_ && root_layer_->tree_reads_surface();
   }