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

Unified Diff: cc/heads_up_display_layer.cc

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.h ('k') | cc/heads_up_display_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/heads_up_display_layer.cc
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index ac7939af9910db4cc74a4bcb44240cabd5dea83d..cfbfea7af0825b4548419bb670eb20f270f0fb4e 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -17,7 +17,6 @@ scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()
HeadsUpDisplayLayer::HeadsUpDisplayLayer()
: Layer()
- , m_hasFontAtlas(false)
{
setBounds(gfx::Size(256, 256));
}
@@ -53,26 +52,9 @@ bool HeadsUpDisplayLayer::drawsContent() const
return true;
}
-void HeadsUpDisplayLayer::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
-{
- m_fontAtlas = fontAtlas.Pass();
- m_hasFontAtlas = true;
-}
-
scoped_ptr<LayerImpl> HeadsUpDisplayLayer::createLayerImpl(LayerTreeImpl* treeImpl)
{
return HeadsUpDisplayLayerImpl::create(treeImpl, m_layerId).PassAs<LayerImpl>();
}
-void HeadsUpDisplayLayer::pushPropertiesTo(LayerImpl* layerImpl)
-{
- Layer::pushPropertiesTo(layerImpl);
-
- if (!m_fontAtlas)
- return;
-
- HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
- hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
-}
-
} // namespace cc
« no previous file with comments | « cc/heads_up_display_layer.h ('k') | cc/heads_up_display_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698