| 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_( | 21 : typeface_(SkTypeface::MakeFromName("times new roman", SkFontStyle())) { |
| 22 SkTypeface::CreateFromName("times new roman", SkTypeface::kNormal)) { | |
| 23 if (!typeface_) { | 22 if (!typeface_) { |
| 24 typeface_ = sk_sp<SkTypeface>( | 23 typeface_ = SkTypeface::MakeFromName( |
| 25 SkTypeface::CreateFromName("monospace", SkTypeface::kBold)); | 24 "monospace", SkFontStyle::FromOldStyle(SkTypeface::kBold)); |
| 26 } | 25 } |
| 27 DCHECK(typeface_.get()); | 26 DCHECK(typeface_.get()); |
| 28 SetIsDrawable(true); | 27 SetIsDrawable(true); |
| 29 UpdateDrawsContent(HasDrawableContent()); | 28 UpdateDrawsContent(HasDrawableContent()); |
| 30 } | 29 } |
| 31 | 30 |
| 32 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() {} | 31 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() {} |
| 33 | 32 |
| 34 void HeadsUpDisplayLayer::PrepareForCalculateDrawProperties( | 33 void HeadsUpDisplayLayer::PrepareForCalculateDrawProperties( |
| 35 const gfx::Size& device_viewport, float device_scale_factor) { | 34 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) { | 74 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { |
| 76 Layer::PushPropertiesTo(layer); | 75 Layer::PushPropertiesTo(layer); |
| 77 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); | 76 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); |
| 78 HeadsUpDisplayLayerImpl* layer_impl = | 77 HeadsUpDisplayLayerImpl* layer_impl = |
| 79 static_cast<HeadsUpDisplayLayerImpl*>(layer); | 78 static_cast<HeadsUpDisplayLayerImpl*>(layer); |
| 80 | 79 |
| 81 layer_impl->SetHUDTypeface(typeface_); | 80 layer_impl->SetHUDTypeface(typeface_); |
| 82 } | 81 } |
| 83 | 82 |
| 84 } // namespace cc | 83 } // namespace cc |
| OLD | NEW |