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

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

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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_layer_impl.h » ('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"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 56
57 SetBounds(bounds); 57 SetBounds(bounds);
58 SetTransform(matrix); 58 SetTransform(matrix);
59 } 59 }
60 60
61 bool HeadsUpDisplayLayer::HasDrawableContent() const { 61 bool HeadsUpDisplayLayer::HasDrawableContent() const {
62 return true; 62 return true;
63 } 63 }
64 64
65 scoped_ptr<LayerImpl> HeadsUpDisplayLayer::CreateLayerImpl( 65 std::unique_ptr<LayerImpl> HeadsUpDisplayLayer::CreateLayerImpl(
66 LayerTreeImpl* tree_impl) { 66 LayerTreeImpl* tree_impl) {
67 return HeadsUpDisplayLayerImpl::Create(tree_impl, layer_id_); 67 return HeadsUpDisplayLayerImpl::Create(tree_impl, layer_id_);
68 } 68 }
69 69
70 void HeadsUpDisplayLayer::SetTypeForProtoSerialization( 70 void HeadsUpDisplayLayer::SetTypeForProtoSerialization(
71 proto::LayerNode* proto) const { 71 proto::LayerNode* proto) const {
72 proto->set_type(proto::LayerNode::HEADS_UP_DISPLAY_LAYER); 72 proto->set_type(proto::LayerNode::HEADS_UP_DISPLAY_LAYER);
73 } 73 }
74 74
75 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) { 75 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) {
76 Layer::PushPropertiesTo(layer); 76 Layer::PushPropertiesTo(layer);
77 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo"); 77 TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo");
78 HeadsUpDisplayLayerImpl* layer_impl = 78 HeadsUpDisplayLayerImpl* layer_impl =
79 static_cast<HeadsUpDisplayLayerImpl*>(layer); 79 static_cast<HeadsUpDisplayLayerImpl*>(layer);
80 80
81 layer_impl->SetHUDTypeface(typeface_); 81 layer_impl->SetHUDTypeface(typeface_);
82 } 82 }
83 83
84 } // namespace cc 84 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/heads_up_display_layer.h ('k') | cc/layers/heads_up_display_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698