Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Side by Side Diff: cc/heads_up_display_layer.h

Issue 12212099: cc: remove FontAtlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 182043 Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/font_atlas.cc ('k') | cc/heads_up_display_layer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/cc_export.h" 9 #include "cc/cc_export.h"
10 #include "cc/font_atlas.h"
11 #include "cc/layer.h" 10 #include "cc/layer.h"
12 11
13 namespace cc { 12 namespace cc {
14 13
15 class CC_EXPORT HeadsUpDisplayLayer : public Layer { 14 class CC_EXPORT HeadsUpDisplayLayer : public Layer {
16 public: 15 public:
17 static scoped_refptr<HeadsUpDisplayLayer> create(); 16 static scoped_refptr<HeadsUpDisplayLayer> create();
18 17
19 virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, Rendering Stats*) OVERRIDE; 18 virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, Rendering Stats*) OVERRIDE;
20 virtual bool drawsContent() const OVERRIDE; 19 virtual bool drawsContent() const OVERRIDE;
21 20
22 void setFontAtlas(scoped_ptr<FontAtlas>);
23
24 virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERR IDE; 21 virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERR IDE;
25 virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
26
27 bool hasFontAtlas() const { return m_hasFontAtlas; }
28 22
29 protected: 23 protected:
30 HeadsUpDisplayLayer(); 24 HeadsUpDisplayLayer();
31 25
32 private: 26 private:
33 virtual ~HeadsUpDisplayLayer(); 27 virtual ~HeadsUpDisplayLayer();
34
35 scoped_ptr<FontAtlas> m_fontAtlas;
36 bool m_hasFontAtlas;
37 }; 28 };
38 29
39 } // namespace cc 30 } // namespace cc
40 31
41 #endif // CC_HEADS_UP_DISPLAY_LAYER_H_ 32 #endif // CC_HEADS_UP_DISPLAY_LAYER_H_
OLDNEW
« no previous file with comments | « cc/font_atlas.cc ('k') | cc/heads_up_display_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698