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

Side by Side Diff: cc/layers/picture_image_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/picture_image_layer_impl.h ('k') | cc/layers/picture_image_layer_impl_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/picture_image_layer_impl.h" 5 #include "cc/layers/picture_image_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/debug/debug_colors.h" 9 #include "cc/debug/debug_colors.h"
10 #include "cc/trees/layer_tree_impl.h" 10 #include "cc/trees/layer_tree_impl.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 PictureImageLayerImpl::PictureImageLayerImpl(LayerTreeImpl* tree_impl, 14 PictureImageLayerImpl::PictureImageLayerImpl(LayerTreeImpl* tree_impl,
15 int id, 15 int id,
16 bool is_mask) 16 bool is_mask)
17 : PictureLayerImpl(tree_impl, id, is_mask) {} 17 : PictureLayerImpl(tree_impl, id, is_mask) {}
18 18
19 PictureImageLayerImpl::~PictureImageLayerImpl() { 19 PictureImageLayerImpl::~PictureImageLayerImpl() {
20 } 20 }
21 21
22 const char* PictureImageLayerImpl::LayerTypeAsString() const { 22 const char* PictureImageLayerImpl::LayerTypeAsString() const {
23 return "cc::PictureImageLayerImpl"; 23 return "cc::PictureImageLayerImpl";
24 } 24 }
25 25
26 scoped_ptr<LayerImpl> PictureImageLayerImpl::CreateLayerImpl( 26 std::unique_ptr<LayerImpl> PictureImageLayerImpl::CreateLayerImpl(
27 LayerTreeImpl* tree_impl) { 27 LayerTreeImpl* tree_impl) {
28 return PictureImageLayerImpl::Create(tree_impl, id(), is_mask_); 28 return PictureImageLayerImpl::Create(tree_impl, id(), is_mask_);
29 } 29 }
30 30
31 void PictureImageLayerImpl::GetDebugBorderProperties( 31 void PictureImageLayerImpl::GetDebugBorderProperties(
32 SkColor* color, float* width) const { 32 SkColor* color, float* width) const {
33 *color = DebugColors::ImageLayerBorderColor(); 33 *color = DebugColors::ImageLayerBorderColor();
34 *width = DebugColors::ImageLayerBorderWidth(layer_tree_impl()); 34 *width = DebugColors::ImageLayerBorderWidth(layer_tree_impl());
35 } 35 }
36 36
(...skipping 13 matching lines...) Expand all
50 } 50 }
51 51
52 void PictureImageLayerImpl::UpdateIdealScales() { 52 void PictureImageLayerImpl::UpdateIdealScales() {
53 ideal_contents_scale_ = 1.f; 53 ideal_contents_scale_ = 1.f;
54 ideal_page_scale_ = 1.f; 54 ideal_page_scale_ = 1.f;
55 ideal_device_scale_ = 1.f; 55 ideal_device_scale_ = 1.f;
56 ideal_source_scale_ = 1.f; 56 ideal_source_scale_ = 1.f;
57 } 57 }
58 58
59 } // namespace cc 59 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer_impl.h ('k') | cc/layers/picture_image_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698