| Index: cc/layer_tree_host.h
|
| diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
|
| index 6e8795f4c035a7bf79bbe9256ebd2e37acb33f0e..fd73692038c455b5d720520b99afa4ac2c438c72 100644
|
| --- a/cc/layer_tree_host.h
|
| +++ b/cc/layer_tree_host.h
|
| @@ -40,7 +40,6 @@ struct hash<WebKit::WebGraphicsContext3D*> {
|
|
|
| namespace cc {
|
|
|
| -class FontAtlas;
|
| class Layer;
|
| class LayerTreeHostImpl;
|
| class LayerTreeHostImplClient;
|
| @@ -68,6 +67,7 @@ struct CC_EXPORT LayerTreeDebugState {
|
|
|
| bool showHudInfo() const;
|
| bool showHudRects() const;
|
| + bool hudNeedsFont() const;
|
|
|
| static bool equal(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
|
| static LayerTreeDebugState unite(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
|
| @@ -237,8 +237,6 @@ public:
|
| void setDeviceScaleFactor(float);
|
| float deviceScaleFactor() const { return m_deviceScaleFactor; }
|
|
|
| - void setFontAtlas(scoped_ptr<FontAtlas>);
|
| -
|
| HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
|
|
|
| Proxy* proxy() const { return m_proxy.get(); }
|
| @@ -268,8 +266,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;
|
|
|
|
|