Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_HEADS_UP_DISPLAY_LAYER_H_ | 5 #ifndef CC_HEADS_UP_DISPLAY_LAYER_H_ |
| 6 #define CC_HEADS_UP_DISPLAY_LAYER_H_ | 6 #define CC_HEADS_UP_DISPLAY_LAYER_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/font_atlas.h" | 9 #include "cc/font_atlas.h" |
| 10 #include "cc/layer.h" | 10 #include "cc/layer.h" |
| 11 | 11 |
| 12 namespace cc { | 12 namespace cc { |
| 13 | 13 |
| 14 class HeadsUpDisplayLayer : public Layer { | 14 class HeadsUpDisplayLayer : public Layer { |
| 15 public: | 15 public: |
| 16 static scoped_refptr<HeadsUpDisplayLayer> create(); | 16 static scoped_refptr<HeadsUpDisplayLayer> create(); |
| 17 | 17 |
| 18 virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, Rendering Stats&) OVERRIDE; | 18 virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, Rendering Stats&) OVERRIDE; |
| 19 virtual bool drawsContent() const OVERRIDE; | 19 virtual bool drawsContent() const OVERRIDE; |
| 20 | 20 |
| 21 void setFontAtlas(scoped_ptr<FontAtlas>); | 21 void setFontAtlas(scoped_ptr<FontAtlas>); |
| 22 void setShowFPSCounter(bool); | 22 void setShowFPSCounter(bool); |
| 23 | 23 |
| 24 virtual scoped_ptr<LayerImpl> createLayerImpl() OVERRIDE; | 24 virtual scoped_ptr<LayerImpl> createLayerImpl() OVERRIDE; |
| 25 virtual void pushPropertiesTo(LayerImpl*) OVERRIDE; | 25 virtual void pushPropertiesTo(LayerImpl*) OVERRIDE; |
| 26 | 26 |
| 27 bool hasFontAtlas() const { return m_hasFontAtlas; } | |
| 28 | |
| 27 protected: | 29 protected: |
| 28 HeadsUpDisplayLayer(); | 30 HeadsUpDisplayLayer(); |
| 29 | 31 |
| 30 private: | 32 private: |
| 31 virtual ~HeadsUpDisplayLayer(); | 33 virtual ~HeadsUpDisplayLayer(); |
| 32 | 34 |
| 33 scoped_ptr<FontAtlas> m_fontAtlas; | 35 scoped_ptr<FontAtlas> m_fontAtlas; |
| 34 bool m_showFPSCounter; | 36 bool m_showFPSCounter; |
| 37 | |
| 38 bool m_hasFontAtlas; | |
|
jamesr
2012/11/27 21:07:44
why do we need a bool? Can't we just null-check m_
danakj
2012/11/27 21:26:14
This seems needed to remember we gave a font atlas
egraether
2012/11/27 21:49:22
Yeah, it's there because as soon as the fontAtlas
| |
| 35 }; | 39 }; |
| 36 | 40 |
| 37 } // namespace cc | 41 } // namespace cc |
| 38 | 42 |
| 39 #endif // CC_HEADS_UP_DISPLAY_LAYER_H_ | 43 #endif // CC_HEADS_UP_DISPLAY_LAYER_H_ |
| OLD | NEW |