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

Side by Side Diff: cc/layers/heads_up_display_layer.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « cc/layers/heads_up_display_layer.h ('k') | cc/layers/heads_up_display_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 const LayerSettings& settings) { 17 return make_scoped_refptr(new HeadsUpDisplayLayer());
18 return make_scoped_refptr(new HeadsUpDisplayLayer(settings));
19 } 18 }
20 19
21 HeadsUpDisplayLayer::HeadsUpDisplayLayer(const LayerSettings& settings) 20 HeadsUpDisplayLayer::HeadsUpDisplayLayer()
22 : Layer(settings), 21 : typeface_(skia::AdoptRef(
23 typeface_(skia::AdoptRef(
24 SkTypeface::CreateFromName("times new roman", SkTypeface::kNormal))) { 22 SkTypeface::CreateFromName("times new roman", SkTypeface::kNormal))) {
25 if (!typeface_) { 23 if (!typeface_) {
26 typeface_ = skia::AdoptRef( 24 typeface_ = skia::AdoptRef(
27 SkTypeface::CreateFromName("monospace", SkTypeface::kBold)); 25 SkTypeface::CreateFromName("monospace", SkTypeface::kBold));
28 } 26 }
29 DCHECK(typeface_.get()); 27 DCHECK(typeface_.get());
30 SetIsDrawable(true); 28 SetIsDrawable(true);
31 UpdateDrawsContent(HasDrawableContent()); 29 UpdateDrawsContent(HasDrawableContent());
32 } 30 }
33 31
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { 75 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) {
78 Layer::PushPropertiesTo(layer); 76 Layer::PushPropertiesTo(layer);
79 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); 77 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo");
80 HeadsUpDisplayLayerImpl* layer_impl = 78 HeadsUpDisplayLayerImpl* layer_impl =
81 static_cast<HeadsUpDisplayLayerImpl*>(layer); 79 static_cast<HeadsUpDisplayLayerImpl*>(layer);
82 80
83 layer_impl->SetHUDTypeface(typeface_); 81 layer_impl->SetHUDTypeface(typeface_);
84 } 82 }
85 83
86 } // namespace cc 84 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/heads_up_display_layer.h ('k') | cc/layers/heads_up_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698