OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/layers/heads_up_display_layer.h" | 5 #include "cc/layers/heads_up_display_layer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
10 #include "cc/layers/heads_up_display_layer_impl.h" | 10 #include "cc/layers/heads_up_display_layer_impl.h" |
11 #include "cc/proto/layer.pb.h" | 11 #include "cc/proto/layer.pb.h" |
12 #include "cc/trees/layer_tree_host.h" | 12 #include "cc/trees/layer_tree_host.h" |
13 | 13 |
14 namespace cc { | 14 namespace cc { |
15 | 15 |
16 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() { | 16 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() { |
17 return make_scoped_refptr(new HeadsUpDisplayLayer()); | 17 return make_scoped_refptr(new HeadsUpDisplayLayer()); |
18 } | 18 } |
19 | 19 |
20 HeadsUpDisplayLayer::HeadsUpDisplayLayer() | 20 HeadsUpDisplayLayer::HeadsUpDisplayLayer() |
21 : typeface_(skia::AdoptRef( | 21 : typeface_(skia::AdoptRef( |
22 SkTypeface::CreateFromName("times new roman", SkTypeface::kNormal))) { | 22 SkTypeface::CreateFromName("times new roman", SkFontStyle()))) { |
23 if (!typeface_) { | 23 if (!typeface_) { |
24 typeface_ = skia::AdoptRef( | 24 const SkFontStyle style(SkFontStyle::kBold_Weight, |
25 SkTypeface::CreateFromName("monospace", SkTypeface::kBold)); | 25 SkFontStyle::kNormal_Width, |
| 26 SkFontStyle::kUpright_Slant); |
| 27 typeface_ = skia::AdoptRef(SkTypeface::CreateFromName("monospace", style)); |
26 } | 28 } |
27 DCHECK(typeface_.get()); | 29 DCHECK(typeface_.get()); |
28 SetIsDrawable(true); | 30 SetIsDrawable(true); |
29 UpdateDrawsContent(HasDrawableContent()); | 31 UpdateDrawsContent(HasDrawableContent()); |
30 } | 32 } |
31 | 33 |
32 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() {} | 34 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() {} |
33 | 35 |
34 void HeadsUpDisplayLayer::PrepareForCalculateDrawProperties( | 36 void HeadsUpDisplayLayer::PrepareForCalculateDrawProperties( |
35 const gfx::Size& device_viewport, float device_scale_factor) { | 37 const gfx::Size& device_viewport, float device_scale_factor) { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { | 77 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { |
76 Layer::PushPropertiesTo(layer); | 78 Layer::PushPropertiesTo(layer); |
77 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); | 79 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); |
78 HeadsUpDisplayLayerImpl* layer_impl = | 80 HeadsUpDisplayLayerImpl* layer_impl = |
79 static_cast<HeadsUpDisplayLayerImpl*>(layer); | 81 static_cast<HeadsUpDisplayLayerImpl*>(layer); |
80 | 82 |
81 layer_impl->SetHUDTypeface(typeface_); | 83 layer_impl->SetHUDTypeface(typeface_); |
82 } | 84 } |
83 | 85 |
84 } // namespace cc | 86 } // namespace cc |
OLD | NEW |