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

Side by Side Diff: cc/test/fake_picture_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/test/fake_picture_layer.h ('k') | cc/test/fake_picture_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/test/fake_picture_layer.h" 5 #include "cc/test/fake_picture_layer.h"
6 6
7 #include "cc/test/fake_picture_layer_impl.h" 7 #include "cc/test/fake_picture_layer_impl.h"
8 8
9 namespace cc { 9 namespace cc {
10 10
11 FakePictureLayer::FakePictureLayer(ContentLayerClient* client) 11 FakePictureLayer::FakePictureLayer(ContentLayerClient* client)
12 : PictureLayer(client), 12 : PictureLayer(client),
13 update_count_(0), 13 update_count_(0),
14 push_properties_count_(0), 14 push_properties_count_(0),
15 always_update_resources_(false) { 15 always_update_resources_(false) {
16 SetBounds(gfx::Size(1, 1)); 16 SetBounds(gfx::Size(1, 1));
17 SetIsDrawable(true); 17 SetIsDrawable(true);
18 } 18 }
19 19
20 FakePictureLayer::FakePictureLayer(ContentLayerClient* client, 20 FakePictureLayer::FakePictureLayer(ContentLayerClient* client,
21 scoped_ptr<RecordingSource> source) 21 std::unique_ptr<RecordingSource> source)
22 : PictureLayer(client, std::move(source)), 22 : PictureLayer(client, std::move(source)),
23 update_count_(0), 23 update_count_(0),
24 push_properties_count_(0), 24 push_properties_count_(0),
25 always_update_resources_(false) { 25 always_update_resources_(false) {
26 SetBounds(gfx::Size(1, 1)); 26 SetBounds(gfx::Size(1, 1));
27 SetIsDrawable(true); 27 SetIsDrawable(true);
28 } 28 }
29 29
30 FakePictureLayer::~FakePictureLayer() {} 30 FakePictureLayer::~FakePictureLayer() {}
31 31
32 scoped_ptr<LayerImpl> FakePictureLayer::CreateLayerImpl( 32 std::unique_ptr<LayerImpl> FakePictureLayer::CreateLayerImpl(
33 LayerTreeImpl* tree_impl) { 33 LayerTreeImpl* tree_impl) {
34 if (is_mask()) 34 if (is_mask())
35 return FakePictureLayerImpl::CreateMask(tree_impl, layer_id_); 35 return FakePictureLayerImpl::CreateMask(tree_impl, layer_id_);
36 return FakePictureLayerImpl::Create(tree_impl, layer_id_); 36 return FakePictureLayerImpl::Create(tree_impl, layer_id_);
37 } 37 }
38 38
39 bool FakePictureLayer::Update() { 39 bool FakePictureLayer::Update() {
40 bool updated = PictureLayer::Update(); 40 bool updated = PictureLayer::Update();
41 update_count_++; 41 update_count_++;
42 return updated || always_update_resources_; 42 return updated || always_update_resources_;
43 } 43 }
44 44
45 void FakePictureLayer::PushPropertiesTo(LayerImpl* layer) { 45 void FakePictureLayer::PushPropertiesTo(LayerImpl* layer) {
46 PictureLayer::PushPropertiesTo(layer); 46 PictureLayer::PushPropertiesTo(layer);
47 push_properties_count_++; 47 push_properties_count_++;
48 } 48 }
49 49
50 } // namespace cc 50 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_picture_layer.h ('k') | cc/test/fake_picture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698