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

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

Issue 2053983003: cc : Move LayerImpl::parent to test properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 6 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/layer_impl_test_properties.h ('k') | cc/layers/layer_list_iterator.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/layer_impl_test_properties.h" 5 #include "cc/layers/layer_impl_test_properties.h"
6 6
7 #include "cc/layers/layer_impl.h" 7 #include "cc/layers/layer_impl.h"
8 #include "cc/output/copy_output_request.h" 8 #include "cc/output/copy_output_request.h"
9 #include "cc/trees/layer_tree_impl.h" 9 #include "cc/trees/layer_tree_impl.h"
10 10
11 namespace cc { 11 namespace cc {
12 12
13 LayerImplTestProperties::LayerImplTestProperties(LayerImpl* owning_layer) 13 LayerImplTestProperties::LayerImplTestProperties(LayerImpl* owning_layer)
14 : owning_layer(owning_layer), 14 : owning_layer(owning_layer),
15 double_sided(true), 15 double_sided(true),
16 force_render_surface(false), 16 force_render_surface(false),
17 is_container_for_fixed_position_layers(false), 17 is_container_for_fixed_position_layers(false),
18 should_flatten_transform(true), 18 should_flatten_transform(true),
19 hide_layer_and_subtree(false), 19 hide_layer_and_subtree(false),
20 opacity_can_animate(false), 20 opacity_can_animate(false),
21 num_descendants_that_draw_content(0), 21 num_descendants_that_draw_content(0),
22 num_unclipped_descendants(0), 22 num_unclipped_descendants(0),
23 opacity(1.f), 23 opacity(1.f),
24 scroll_parent(nullptr), 24 scroll_parent(nullptr),
25 clip_parent(nullptr), 25 clip_parent(nullptr),
26 mask_layer(nullptr), 26 mask_layer(nullptr),
27 replica_layer(nullptr) {} 27 replica_layer(nullptr),
28 parent(nullptr) {}
28 29
29 LayerImplTestProperties::~LayerImplTestProperties() {} 30 LayerImplTestProperties::~LayerImplTestProperties() {}
30 31
31 void LayerImplTestProperties::SetMaskLayer(std::unique_ptr<LayerImpl> mask) { 32 void LayerImplTestProperties::SetMaskLayer(std::unique_ptr<LayerImpl> mask) {
32 if (mask_layer) 33 if (mask_layer)
33 owning_layer->layer_tree_impl()->RemoveLayer(mask_layer->id()); 34 owning_layer->layer_tree_impl()->RemoveLayer(mask_layer->id());
34 mask_layer = mask.get(); 35 mask_layer = mask.get();
35 if (mask) 36 if (mask)
36 owning_layer->layer_tree_impl()->AddLayer(std::move(mask)); 37 owning_layer->layer_tree_impl()->AddLayer(std::move(mask));
37 } 38 }
38 39
39 void LayerImplTestProperties::SetReplicaLayer( 40 void LayerImplTestProperties::SetReplicaLayer(
40 std::unique_ptr<LayerImpl> replica) { 41 std::unique_ptr<LayerImpl> replica) {
41 if (replica_layer) { 42 if (replica_layer) {
42 replica_layer->test_properties()->SetMaskLayer(nullptr); 43 replica_layer->test_properties()->SetMaskLayer(nullptr);
43 owning_layer->layer_tree_impl()->RemoveLayer(replica_layer->id()); 44 owning_layer->layer_tree_impl()->RemoveLayer(replica_layer->id());
44 } 45 }
45 replica_layer = replica.get(); 46 replica_layer = replica.get();
46 if (replica) { 47 if (replica) {
47 replica->SetParent(owning_layer); 48 replica->test_properties()->parent = owning_layer;
48 owning_layer->layer_tree_impl()->AddLayer(std::move(replica)); 49 owning_layer->layer_tree_impl()->AddLayer(std::move(replica));
49 } 50 }
50 } 51 }
51 52
52 } // namespace cc 53 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl_test_properties.h ('k') | cc/layers/layer_list_iterator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698