| Index: cc/layer_tree_host.h
|
| diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
|
| index 5056345d07c8fb6810413415eaf7fc2993842adf..631f2ca3e19f8330ac68104093553298ca64b1f2 100644
|
| --- a/cc/layer_tree_host.h
|
| +++ b/cc/layer_tree_host.h
|
| @@ -56,14 +56,6 @@ struct CC_EXPORT LayerTreeSettings {
|
|
|
| bool acceleratePainting;
|
| bool showDebugBorders;
|
| - bool showPlatformLayerTree;
|
| - bool showPaintRects;
|
| - bool showPropertyChangedRects;
|
| - bool showSurfaceDamageRects;
|
| - bool showScreenSpaceRects;
|
| - bool showReplicaScreenSpaceRects;
|
| - bool showOccludingRects;
|
| - bool showNonOccludingRects;
|
| bool renderVSyncEnabled;
|
| bool perTilePaintingEnabled;
|
| bool partialSwapEnabled;
|
| @@ -76,9 +68,6 @@ struct CC_EXPORT LayerTreeSettings {
|
| gfx::Size defaultTileSize;
|
| gfx::Size maxUntiledLayerSize;
|
| gfx::Size minimumOcclusionTrackingSize;
|
| -
|
| - bool showDebugInfo() const { return showPlatformLayerTree || showDebugRects(); }
|
| - bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects || showNonOccludingRects; }
|
| };
|
|
|
| // Provides information on an Impl's rendering capabilities back to the LayerTreeHost
|
| @@ -216,10 +205,8 @@ 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(); }
|
| + HeadsUpDisplayLayer* requestHUDLayer();
|
|
|
| Proxy* proxy() const { return m_proxy.get(); }
|
|
|
| @@ -248,8 +235,6 @@ private:
|
| bool animateLayersRecursive(Layer* current, base::TimeTicks time);
|
| void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime);
|
|
|
| - void createHUDLayerIfNeeded();
|
| -
|
| bool m_animating;
|
| bool m_needsAnimateLayers;
|
|
|
|
|