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

Unified Diff: cc/heads_up_display_layer_impl.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/heads_up_display_layer.cc ('k') | cc/heads_up_display_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/heads_up_display_layer_impl.h
diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h
index df01495d08ec04c2ed00341e54acbdca6e9c8dc8..e45cc2402d5f1bff6fb4ff112c73d48ec8eaee9b 100644
--- a/cc/heads_up_display_layer_impl.h
+++ b/cc/heads_up_display_layer_impl.h
@@ -8,7 +8,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "cc/cc_export.h"
-#include "cc/font_atlas.h"
#include "cc/layer_impl.h"
#include "cc/scoped_resource.h"
@@ -20,7 +19,6 @@ struct SkRect;
namespace cc {
class DebugRectHistory;
-class FontAtlas;
class FrameRateCounter;
class MemoryHistory;
class PaintTimeCounter;
@@ -33,10 +31,7 @@ public:
}
virtual ~HeadsUpDisplayLayerImpl();
- void setFontAtlas(scoped_ptr<FontAtlas>);
-
virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERRIDE;
- virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
virtual void willDraw(ResourceProvider*) OVERRIDE;
virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
@@ -82,7 +77,6 @@ private:
void drawDebugRects(SkCanvas*, DebugRectHistory*);
- scoped_ptr<FontAtlas> m_fontAtlas;
scoped_ptr<ScopedResource> m_hudTexture;
scoped_ptr<SkCanvas> m_hudCanvas;
« no previous file with comments | « cc/heads_up_display_layer.cc ('k') | cc/heads_up_display_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698