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

Side by Side Diff: cc/layers/surface_layer_impl.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/surface_layer_impl.h ('k') | cc/layers/surface_layer_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/surface_layer_impl.h" 5 #include "cc/layers/surface_layer_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/trace_event/trace_event_argument.h" 9 #include "base/trace_event/trace_event_argument.h"
10 #include "cc/debug/debug_colors.h" 10 #include "cc/debug/debug_colors.h"
11 #include "cc/quads/solid_color_draw_quad.h" 11 #include "cc/quads/solid_color_draw_quad.h"
12 #include "cc/quads/surface_draw_quad.h" 12 #include "cc/quads/surface_draw_quad.h"
13 #include "cc/trees/layer_tree_impl.h" 13 #include "cc/trees/layer_tree_impl.h"
14 #include "cc/trees/occlusion.h" 14 #include "cc/trees/occlusion.h"
15 15
16 namespace cc { 16 namespace cc {
17 17
18 SurfaceLayerImpl::SurfaceLayerImpl(LayerTreeImpl* tree_impl, int id) 18 SurfaceLayerImpl::SurfaceLayerImpl(LayerTreeImpl* tree_impl, int id)
19 : LayerImpl(tree_impl, id), surface_scale_(0.f) { 19 : LayerImpl(tree_impl, id), surface_scale_(0.f) {
20 layer_tree_impl()->AddSurfaceLayer(this); 20 layer_tree_impl()->AddSurfaceLayer(this);
21 } 21 }
22 22
23 SurfaceLayerImpl::~SurfaceLayerImpl() { 23 SurfaceLayerImpl::~SurfaceLayerImpl() {
24 layer_tree_impl()->RemoveSurfaceLayer(this); 24 layer_tree_impl()->RemoveSurfaceLayer(this);
25 } 25 }
26 26
27 scoped_ptr<LayerImpl> SurfaceLayerImpl::CreateLayerImpl( 27 std::unique_ptr<LayerImpl> SurfaceLayerImpl::CreateLayerImpl(
28 LayerTreeImpl* tree_impl) { 28 LayerTreeImpl* tree_impl) {
29 return SurfaceLayerImpl::Create(tree_impl, id()); 29 return SurfaceLayerImpl::Create(tree_impl, id());
30 } 30 }
31 31
32 void SurfaceLayerImpl::SetSurfaceId(SurfaceId surface_id) { 32 void SurfaceLayerImpl::SetSurfaceId(SurfaceId surface_id) {
33 if (surface_id_ == surface_id) 33 if (surface_id_ == surface_id)
34 return; 34 return;
35 35
36 surface_id_ = surface_id; 36 surface_id_ = surface_id;
37 NoteLayerPropertyChanged(); 37 NoteLayerPropertyChanged();
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 void SurfaceLayerImpl::AsValueInto(base::trace_event::TracedValue* dict) const { 180 void SurfaceLayerImpl::AsValueInto(base::trace_event::TracedValue* dict) const {
181 LayerImpl::AsValueInto(dict); 181 LayerImpl::AsValueInto(dict);
182 dict->SetInteger("surface_id", surface_id_.id); 182 dict->SetInteger("surface_id", surface_id_.id);
183 } 183 }
184 184
185 const char* SurfaceLayerImpl::LayerTypeAsString() const { 185 const char* SurfaceLayerImpl::LayerTypeAsString() const {
186 return "cc::SurfaceLayerImpl"; 186 return "cc::SurfaceLayerImpl";
187 } 187 }
188 188
189 } // namespace cc 189 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/surface_layer_impl.h ('k') | cc/layers/surface_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698