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 #include "cc/trees/layer_tree_settings.h" |
13 | 14 |
14 namespace cc { | 15 namespace cc { |
15 | 16 |
16 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() { | 17 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() { |
17 return make_scoped_refptr(new HeadsUpDisplayLayer()); | 18 return make_scoped_refptr(new HeadsUpDisplayLayer()); |
18 } | 19 } |
19 | 20 |
20 HeadsUpDisplayLayer::HeadsUpDisplayLayer() | 21 HeadsUpDisplayLayer::HeadsUpDisplayLayer() |
21 : typeface_(SkTypeface::MakeFromName("times new roman", SkFontStyle())) { | 22 : typeface_(SkTypeface::MakeFromName("times new roman", SkFontStyle())) { |
22 if (!typeface_) { | 23 if (!typeface_) { |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { | 70 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { |
70 Layer::PushPropertiesTo(layer); | 71 Layer::PushPropertiesTo(layer); |
71 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); | 72 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); |
72 HeadsUpDisplayLayerImpl* layer_impl = | 73 HeadsUpDisplayLayerImpl* layer_impl = |
73 static_cast<HeadsUpDisplayLayerImpl*>(layer); | 74 static_cast<HeadsUpDisplayLayerImpl*>(layer); |
74 | 75 |
75 layer_impl->SetHUDTypeface(typeface_); | 76 layer_impl->SetHUDTypeface(typeface_); |
76 } | 77 } |
77 | 78 |
78 } // namespace cc | 79 } // namespace cc |
OLD | NEW |