| OLD | NEW |
| 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/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.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 972 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 983 return; | 983 return; |
| 984 } | 984 } |
| 985 | 985 |
| 986 if (mask_layer_) | 986 if (mask_layer_) |
| 987 layer_tree_impl_->RemoveLayer(mask_layer_->id()); | 987 layer_tree_impl_->RemoveLayer(mask_layer_->id()); |
| 988 mask_layer_ = mask_layer.get(); | 988 mask_layer_ = mask_layer.get(); |
| 989 if (mask_layer_) | 989 if (mask_layer_) |
| 990 layer_tree_impl_->AddLayer(std::move(mask_layer)); | 990 layer_tree_impl_->AddLayer(std::move(mask_layer)); |
| 991 | 991 |
| 992 mask_layer_id_ = new_layer_id; | 992 mask_layer_id_ = new_layer_id; |
| 993 if (mask_layer_) | |
| 994 mask_layer_->SetParent(this); | |
| 995 } | 993 } |
| 996 | 994 |
| 997 scoped_ptr<LayerImpl> LayerImpl::TakeMaskLayer() { | 995 scoped_ptr<LayerImpl> LayerImpl::TakeMaskLayer() { |
| 998 mask_layer_id_ = -1; | 996 mask_layer_id_ = -1; |
| 999 scoped_ptr<LayerImpl> ret; | 997 scoped_ptr<LayerImpl> ret; |
| 1000 if (mask_layer_) | 998 if (mask_layer_) |
| 1001 ret = layer_tree_impl_->RemoveLayer(mask_layer_->id()); | 999 ret = layer_tree_impl_->RemoveLayer(mask_layer_->id()); |
| 1002 mask_layer_ = nullptr; | 1000 mask_layer_ = nullptr; |
| 1003 return ret; | 1001 return ret; |
| 1004 } | 1002 } |
| 1005 | 1003 |
| 1006 void LayerImpl::SetReplicaLayer(scoped_ptr<LayerImpl> replica_layer) { | 1004 void LayerImpl::SetReplicaLayer(scoped_ptr<LayerImpl> replica_layer) { |
| 1007 int new_layer_id = replica_layer ? replica_layer->id() : -1; | 1005 int new_layer_id = replica_layer ? replica_layer->id() : -1; |
| 1008 | 1006 |
| 1009 if (replica_layer) { | 1007 if (replica_layer) { |
| 1010 DCHECK_EQ(layer_tree_impl(), replica_layer->layer_tree_impl()); | 1008 DCHECK_EQ(layer_tree_impl(), replica_layer->layer_tree_impl()); |
| 1011 DCHECK_NE(new_layer_id, replica_layer_id_); | 1009 DCHECK_NE(new_layer_id, replica_layer_id_); |
| 1012 } else if (new_layer_id == replica_layer_id_) { | 1010 } else if (new_layer_id == replica_layer_id_) { |
| 1013 return; | 1011 return; |
| 1014 } | 1012 } |
| 1015 | 1013 |
| 1016 if (replica_layer_) | 1014 if (replica_layer_) |
| 1017 layer_tree_impl_->RemoveLayer(replica_layer_->id()); | 1015 layer_tree_impl_->RemoveLayer(replica_layer_->id()); |
| 1018 replica_layer_ = replica_layer.get(); | 1016 replica_layer_ = replica_layer.get(); |
| 1019 if (replica_layer_) | 1017 if (replica_layer_) |
| 1020 layer_tree_impl_->AddLayer(std::move(replica_layer)); | 1018 layer_tree_impl_->AddLayer(std::move(replica_layer)); |
| 1021 | 1019 |
| 1022 replica_layer_id_ = new_layer_id; | 1020 replica_layer_id_ = new_layer_id; |
| 1023 if (replica_layer_) | |
| 1024 replica_layer_->SetParent(this); | |
| 1025 } | 1021 } |
| 1026 | 1022 |
| 1027 scoped_ptr<LayerImpl> LayerImpl::TakeReplicaLayer() { | 1023 scoped_ptr<LayerImpl> LayerImpl::TakeReplicaLayer() { |
| 1028 replica_layer_id_ = -1; | 1024 replica_layer_id_ = -1; |
| 1029 scoped_ptr<LayerImpl> ret; | 1025 scoped_ptr<LayerImpl> ret; |
| 1030 if (replica_layer_) | 1026 if (replica_layer_) |
| 1031 ret = layer_tree_impl_->RemoveLayer(replica_layer_->id()); | 1027 ret = layer_tree_impl_->RemoveLayer(replica_layer_->id()); |
| 1032 replica_layer_ = nullptr; | 1028 replica_layer_ = nullptr; |
| 1033 return ret; | 1029 return ret; |
| 1034 } | 1030 } |
| (...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1604 .layer_transforms_should_scale_layer_contents) { | 1600 .layer_transforms_should_scale_layer_contents) { |
| 1605 return default_scale; | 1601 return default_scale; |
| 1606 } | 1602 } |
| 1607 | 1603 |
| 1608 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1604 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1609 DrawTransform(), default_scale); | 1605 DrawTransform(), default_scale); |
| 1610 return std::max(transform_scales.x(), transform_scales.y()); | 1606 return std::max(transform_scales.x(), transform_scales.y()); |
| 1611 } | 1607 } |
| 1612 | 1608 |
| 1613 } // namespace cc | 1609 } // namespace cc |
| OLD | NEW |