Index: cc/layers/heads_up_display_layer_impl.cc |
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc |
index 2ed00a67f1291826a774384d6f414c8a1b321d76..e1a9daf1ea5e8ba7b8c5436e923ed37655da5a6d 100644 |
--- a/cc/layers/heads_up_display_layer_impl.cc |
+++ b/cc/layers/heads_up_display_layer_impl.cc |
@@ -20,15 +20,13 @@ |
#include "cc/trees/layer_tree_host_impl.h" |
#include "cc/trees/layer_tree_impl.h" |
#include "skia/ext/platform_canvas.h" |
-#include "third_party/khronos/GLES2/gl2.h" |
-#include "third_party/khronos/GLES2/gl2ext.h" |
-#include "third_party/skia/include/core/SkBitmap.h" |
#include "third_party/skia/include/core/SkPaint.h" |
#include "third_party/skia/include/core/SkTypeface.h" |
#include "third_party/skia/include/effects/SkColorMatrixFilter.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/gfx/geometry/size.h" |
#include "ui/gfx/geometry/size_conversions.h" |
+#include "ui/gfx/hud_font.h" |
namespace cc { |
@@ -70,12 +68,15 @@ double HeadsUpDisplayLayerImpl::Graph::UpdateUpperBound() { |
HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl, |
int id) |
: LayerImpl(tree_impl, id), |
- typeface_(skia::AdoptRef( |
- SkTypeface::CreateFromName("monospace", SkTypeface::kBold))), |
+ typeface_(gfx::GetHudTypeface()), |
internal_contents_scale_(1.f), |
fps_graph_(60.0, 80.0), |
paint_time_graph_(16.0, 48.0), |
fade_step_(0) { |
+ if (!typeface_) { |
+ typeface_ = skia::AdoptRef( |
+ SkTypeface::CreateFromName("monospace", SkTypeface::kBold)); |
+ } |
} |
HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl() {} |