cc: handling debug settings in new LayerTreeDebugState structure

cc/layer_tree_host.h

Index: cc/layer_tree_host.h
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index ec8708dd3737791364c2a0cbe0b7eadf0a2edc36..1a8cb88e35dc99ad2502163c651b54ac1c6e96d2 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -50,13 +50,14 @@ class HeadsUpDisplayLayer;
 class Region;
 struct ScrollAndScaleSet;
 
-struct CC_EXPORT LayerTreeSettings {
-    LayerTreeSettings();
-    ~LayerTreeSettings();
+struct CC_EXPORT LayerTreeDebugState {
+    LayerTreeDebugState();
+    ~LayerTreeDebugState();
 
-    bool acceleratePainting;
-    bool showDebugBorders;
+    bool showFPSCounter;
     bool showPlatformLayerTree;
+    bool showDebugBorders;
+
     bool showPaintRects;
     bool showPropertyChangedRects;
     bool showSurfaceDamageRects;
@@ -64,6 +65,19 @@ struct CC_EXPORT LayerTreeSettings {
     bool showReplicaScreenSpaceRects;
     bool showOccludingRects;
     bool showNonOccludingRects;
+
+    bool showHudInfo() const;
+    bool showHudRects() const;
+
+    static bool equal(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
+    static LayerTreeDebugState merge(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
+};
+
+struct CC_EXPORT LayerTreeSettings {
+    LayerTreeSettings();
+    ~LayerTreeSettings();
+
+    bool acceleratePainting;
     bool renderVSyncEnabled;
     bool perTilePaintingEnabled;
     bool partialSwapEnabled;
@@ -77,8 +91,7 @@ struct CC_EXPORT LayerTreeSettings {
     gfx::Size maxUntiledLayerSize;
     gfx::Size minimumOcclusionTrackingSize;
 
-    bool showDebugInfo() const { return showPlatformLayerTree || showDebugRects(); }
-    bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects || showNonOccludingRects; }
+    LayerTreeDebugState initialDebugState;
 };
 
 // Provides information on an Impl's rendering capabilities back to the LayerTreeHost
@@ -182,6 +195,9 @@ public:
 
     const LayerTreeSettings& settings() const { return m_settings; }
 
+    void setDebugState(const LayerTreeDebugState& debugState);
+    const LayerTreeDebugState& debugState() const { return m_debugState; }
+
     void setViewportSize(const gfx::Size& layoutViewportSize, const gfx::Size& deviceViewportSize);
 
     const gfx::Size& layoutViewportSize() const { return m_layoutViewportSize; }
@@ -220,7 +236,6 @@ public:
     void setDeviceScaleFactor(float);
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
 
-    void setShowFPSCounter(bool show);
     void setFontAtlas(scoped_ptr<FontAtlas>);
 
     HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
@@ -277,6 +292,7 @@ private:
     scoped_ptr<PrioritizedResource> m_surfaceMemoryPlaceholder;
 
     LayerTreeSettings m_settings;
+    LayerTreeDebugState m_debugState;
 
     gfx::Size m_layoutViewportSize;
     gfx::Size m_deviceViewportSize;