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

Side by Side Diff: cc/trees/layer_tree_impl.h

Issue 1136643006: Fix cc unit tests that depend on verify_property_trees=true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/trees/layer_tree_host_common_unittest.cc ('k') | no next file » | 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 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
6 #define CC_TREES_LAYER_TREE_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 // Other public methods 126 // Other public methods
127 // --------------------------------------------------------------------------- 127 // ---------------------------------------------------------------------------
128 LayerImpl* root_layer() const { return root_layer_.get(); } 128 LayerImpl* root_layer() const { return root_layer_.get(); }
129 void SetRootLayer(scoped_ptr<LayerImpl>); 129 void SetRootLayer(scoped_ptr<LayerImpl>);
130 scoped_ptr<LayerImpl> DetachLayerTree(); 130 scoped_ptr<LayerImpl> DetachLayerTree();
131 131
132 void SetPropertyTrees(const PropertyTrees& property_trees) { 132 void SetPropertyTrees(const PropertyTrees& property_trees) {
133 property_trees_ = property_trees; 133 property_trees_ = property_trees;
134 } 134 }
135 PropertyTrees* property_trees() { return &property_trees_; }
135 136
136 void PushPropertiesTo(LayerTreeImpl* tree_impl); 137 void PushPropertiesTo(LayerTreeImpl* tree_impl);
137 138
138 int source_frame_number() const { return source_frame_number_; } 139 int source_frame_number() const { return source_frame_number_; }
139 void set_source_frame_number(int frame_number) { 140 void set_source_frame_number(int frame_number) {
140 source_frame_number_ = frame_number; 141 source_frame_number_ = frame_number;
141 } 142 }
142 143
143 HeadsUpDisplayLayerImpl* hud_layer() { return hud_layer_; } 144 HeadsUpDisplayLayerImpl* hud_layer() { return hud_layer_; }
144 void set_hud_layer(HeadsUpDisplayLayerImpl* layer_impl) { 145 void set_hud_layer(HeadsUpDisplayLayerImpl* layer_impl) {
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 427
427 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 428 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
428 429
429 private: 430 private:
430 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 431 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
431 }; 432 };
432 433
433 } // namespace cc 434 } // namespace cc
434 435
435 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 436 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698