| Index: cc/heads_up_display_layer.h
|
| diff --git a/cc/heads_up_display_layer.h b/cc/heads_up_display_layer.h
|
| index 9d087c0e4bec8ceea415b850e6b4e18080fcb1ad..23d514bdf942dcc6e062c5ef14af1df058d5ae35 100644
|
| --- a/cc/heads_up_display_layer.h
|
| +++ b/cc/heads_up_display_layer.h
|
| @@ -12,25 +12,25 @@
|
|
|
| namespace cc {
|
|
|
| -class HeadsUpDisplayLayerChromium : public LayerChromium {
|
| +class HeadsUpDisplayLayer : public Layer {
|
| public:
|
| - static scoped_refptr<HeadsUpDisplayLayerChromium> create();
|
| + static scoped_refptr<HeadsUpDisplayLayer> create();
|
|
|
| - virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
|
| + virtual void update(TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&) OVERRIDE;
|
| virtual bool drawsContent() const OVERRIDE;
|
|
|
| - void setFontAtlas(scoped_ptr<CCFontAtlas>);
|
| + void setFontAtlas(scoped_ptr<FontAtlas>);
|
|
|
| - virtual scoped_ptr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
|
| - virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
|
| + virtual scoped_ptr<LayerImpl> createLayerImpl() OVERRIDE;
|
| + virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
|
|
|
| protected:
|
| - HeadsUpDisplayLayerChromium();
|
| + HeadsUpDisplayLayer();
|
|
|
| private:
|
| - virtual ~HeadsUpDisplayLayerChromium();
|
| + virtual ~HeadsUpDisplayLayer();
|
|
|
| - scoped_ptr<CCFontAtlas> m_fontAtlas;
|
| + scoped_ptr<FontAtlas> m_fontAtlas;
|
| };
|
|
|
| } // namespace cc
|
|
|