DevTools: expose layer compositing reasons and paint count via layer tree agent

Source/core/platform/graphics/GraphicsLayer.h

Index: Source/core/platform/graphics/GraphicsLayer.h
diff --git a/Source/core/platform/graphics/GraphicsLayer.h b/Source/core/platform/graphics/GraphicsLayer.h
index 0b9aab29de6a7ba4e97d1a70b2bb76d131224c85..ae7a045774ea5a366ad41b24baa51a5e57a9540e 100644
--- a/Source/core/platform/graphics/GraphicsLayer.h
+++ b/Source/core/platform/graphics/GraphicsLayer.h
@@ -221,6 +221,7 @@ public:
     virtual WebKit::WebString debugName(WebKit::WebLayer*) OVERRIDE;
 
     void setCompositingReasons(WebKit::WebCompositingReasons);
+    WebKit::WebCompositingReasons compositingReasons() const { return m_compositingReasons; }
 
     GraphicsLayer* parent() const { return m_parent; };
     void setParent(GraphicsLayer*); // Internal use only.
@@ -251,6 +252,8 @@ public:
     bool isReplicated() const { return m_replicaLayer; }
     // The layer that replicates this layer (if any).
     GraphicsLayer* replicaLayer() const { return m_replicaLayer; }
+    // The layer being replicated.
+    GraphicsLayer* replicatedLayer() const { return m_replicatedLayer; }
 
     const FloatPoint& replicatedLayerPosition() const { return m_replicatedLayerPosition; }
     void setReplicatedLayerPosition(const FloatPoint& p) { m_replicatedLayerPosition = p; }
@@ -377,12 +380,7 @@ public:
 
     void dumpLayer(TextStream&, int indent = 0, LayerTreeFlags = LayerTreeNormal) const;
 
-    void setShowRepaintCounter(bool show) { m_showRepaintCounter = show; }
-    bool isShowingRepaintCounter() const { return m_showRepaintCounter; }
-
-    // FIXME: this is really a paint count.
-    int repaintCount() const { return m_repaintCount; }
-    int incrementRepaintCount() { return ++m_repaintCount; }
+    int paintCount() const { return m_paintCount; }
 
     // z-position is the z-equivalent of position(). It's only used for debugging purposes.
     float zPosition() const { return m_zPosition; }
@@ -455,10 +453,10 @@ protected:
     // rotations of >= 180 degrees
     static int validateTransformOperations(const KeyframeValueList&, bool& hasBigRotation);
 
-    // The layer being replicated.
-    GraphicsLayer* replicatedLayer() const { return m_replicatedLayer; }
     void setReplicatedLayer(GraphicsLayer* layer) { m_replicatedLayer = layer; }
 
+    int incrementPaintCount() { return ++m_paintCount; }
+
     // Any factory classes that want to create a GraphicsLayer need to be friends.
     friend class WebKit::GraphicsLayerFactoryChromium;
     explicit GraphicsLayer(GraphicsLayerClient*);
@@ -504,7 +502,6 @@ protected:
     bool m_masksToBounds : 1;
     bool m_drawsContent : 1;
     bool m_contentsVisible : 1;
-    bool m_showRepaintCounter : 1;
 
     GraphicsLayerPaintingPhase m_paintingPhase;
     CompositingCoordinatesOrientation m_contentsOrientation; // affects orientation of layer contents
@@ -521,7 +518,7 @@ protected:
 
     IntRect m_contentsRect;
 
-    int m_repaintCount;
+    int m_paintCount;
 
     Color m_contentsSolidColor;
 
@@ -547,6 +544,7 @@ protected:
     AnimationIdMap m_animationIdMap;
 
     ScrollableArea* m_scrollableArea;
+    WebKit::WebCompositingReasons m_compositingReasons;
 };