Move second internal recursion to a precomputation in layer_tree_host_common.cc

cc/layer.h

Index: cc/layer.h
diff --git a/cc/layer.h b/cc/layer.h
index f8506500ca7a6f144c45d5b4dcc847d35f7cb569..a5d9d7e5e0b27114db97dd701dab7bc49bb61fe8 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -267,10 +267,9 @@ public:
     void setBoundsContainPageScale(bool);
     bool boundsContainPageScale() const { return m_boundsContainPageScale; }
 
-    // Returns 0 if none of the layer's descendants has content to draw,
-    // 1 if exactly one descendant has content to draw, or a number >1
-    // (but necessary the exact number of descendants) otherwise.
-    int descendantsDrawContent();
+    // This value does not consider the layer itself, only its descendants.
+    virtual int numDescendantsThatDrawContent() { return m_numDescendantsThatDrawContent; }
+    void setNumDescendantsThatDrawContent(int num) { m_numDescendantsThatDrawContent = num; }
 
     LayerTreeHost* layerTreeHost() const { return m_layerTreeHost; }
 
@@ -417,6 +416,7 @@ private:
     float m_rasterScale;
     bool m_automaticallyComputeRasterScale;
     bool m_boundsContainPageScale;
+    bool m_numDescendantsThatDrawContent;

[slavi, 2012/12/03 21:33:42]

That should be an int.

 
     gfx::Transform m_implTransform;