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

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

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: Clean up comments, fix mac build Created 3 years, 11 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
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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.h" 5 #include "cc/layers/layer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 layer_tree_->RemoveLayerShouldPushProperties(this); 217 layer_tree_->RemoveLayerShouldPushProperties(this);
218 } 218 }
219 219
220 bool Layer::IsPropertyChangeAllowed() const { 220 bool Layer::IsPropertyChangeAllowed() const {
221 if (!layer_tree_) 221 if (!layer_tree_)
222 return true; 222 return true;
223 223
224 return !layer_tree_->in_paint_layer_contents(); 224 return !layer_tree_->in_paint_layer_contents();
225 } 225 }
226 226
227 sk_sp<SkPicture> Layer::GetPicture() const { 227 sk_sp<PaintRecord> Layer::GetPicture() const {
228 return nullptr; 228 return nullptr;
229 } 229 }
230 230
231 void Layer::SetParent(Layer* layer) { 231 void Layer::SetParent(Layer* layer) {
232 DCHECK(!layer || !layer->HasAncestor(this)); 232 DCHECK(!layer || !layer->HasAncestor(this));
233 233
234 parent_ = layer; 234 parent_ = layer;
235 SetLayerTreeHost(parent_ ? parent_->layer_tree_host() : nullptr); 235 SetLayerTreeHost(parent_ ? parent_->layer_tree_host() : nullptr);
236 236
237 if (!layer_tree_host_) 237 if (!layer_tree_host_)
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1666 1666
1667 LayerTree* Layer::GetLayerTree() const { 1667 LayerTree* Layer::GetLayerTree() const {
1668 return layer_tree_; 1668 return layer_tree_;
1669 } 1669 }
1670 1670
1671 void Layer::SetLayerIdForTesting(int id) { 1671 void Layer::SetLayerIdForTesting(int id) {
1672 inputs_.layer_id = id; 1672 inputs_.layer_id = id;
1673 } 1673 }
1674 1674
1675 } // namespace cc 1675 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698