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

Unified Diff: cc/heads_up_display_layer_impl.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_impl.h ('k') | cc/layer_tree_debug_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/heads_up_display_layer_impl.cc
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 7a20b0b77f107fc65887207fd2883edbcf6c8887..9d664e14d3c9c7a0cb4741f9800d76b684c8fe34 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -8,7 +8,6 @@
#include "base/stringprintf.h"
#include "cc/debug_colors.h"
#include "cc/debug_rect_history.h"
-#include "cc/font_atlas.h"
#include "cc/frame_rate_counter.h"
#include "cc/layer_tree_impl.h"
#include "cc/memory_history.h"
@@ -86,22 +85,6 @@ scoped_ptr<LayerImpl> HeadsUpDisplayLayerImpl::createLayerImpl(LayerTreeImpl* tr
return HeadsUpDisplayLayerImpl::create(treeImpl, id()).PassAs<LayerImpl>();
}
-void HeadsUpDisplayLayerImpl::pushPropertiesTo(LayerImpl* layerImpl)
-{
- LayerImpl::pushPropertiesTo(layerImpl);
-
- if (!m_fontAtlas)
- return;
-
- HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
- hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
-}
-
-void HeadsUpDisplayLayerImpl::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
-{
- m_fontAtlas = fontAtlas.Pass();
-}
-
void HeadsUpDisplayLayerImpl::willDraw(ResourceProvider* resourceProvider)
{
LayerImpl::willDraw(resourceProvider);
« no previous file with comments | « cc/heads_up_display_layer_impl.h ('k') | cc/layer_tree_debug_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698