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

Unified Diff: cc/layer_tree_host.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/layer_tree_debug_state.cc ('k') | cc/layer_tree_host_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index fb99807e60dd968e0146b225061b95c21201ce7e..d9df8c948c238bd3ce91cb7dab6d22915305f3da 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -10,7 +10,6 @@
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "cc/animation_registrar.h"
-#include "cc/font_atlas.h"
#include "cc/heads_up_display_layer.h"
#include "cc/heads_up_display_layer_impl.h"
#include "cc/layer.h"
@@ -340,9 +339,6 @@ void LayerTreeHost::willCommit()
if (!m_hudLayer)
m_hudLayer = HeadsUpDisplayLayer::create();
- if (m_debugState.hudNeedsFont() && !m_hudLayer->hasFontAtlas())
- m_hudLayer->setFontAtlas(m_client->createFontAtlas());
-
if (m_rootLayer && !m_hudLayer->parent())
m_rootLayer->addChild(m_hudLayer);
} else if (m_hudLayer) {
« no previous file with comments | « cc/layer_tree_debug_state.cc ('k') | cc/layer_tree_host_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698