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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/font_atlas.cc ('k') | cc/heads_up_display_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/heads_up_display_layer.h
diff --git a/cc/heads_up_display_layer.h b/cc/heads_up_display_layer.h
index 0100c8edda7ec4b9fcb6698a50a10fd1b22043d6..2943185c0d5e7f9b142562066b2a64e3481f7ba6 100644
--- a/cc/heads_up_display_layer.h
+++ b/cc/heads_up_display_layer.h
@@ -7,7 +7,6 @@
#include "base/memory/scoped_ptr.h"
#include "cc/cc_export.h"
-#include "cc/font_atlas.h"
#include "cc/layer.h"
namespace cc {
@@ -19,21 +18,13 @@ public:
virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats*) OVERRIDE;
virtual bool drawsContent() const OVERRIDE;
- void setFontAtlas(scoped_ptr<FontAtlas>);
-
virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERRIDE;
- virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
-
- bool hasFontAtlas() const { return m_hasFontAtlas; }
protected:
HeadsUpDisplayLayer();
private:
virtual ~HeadsUpDisplayLayer();
-
- scoped_ptr<FontAtlas> m_fontAtlas;
- bool m_hasFontAtlas;
};
} // namespace cc
« 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