OLD | NEW |
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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/atomic_sequence_num.h" | 9 #include "base/atomic_sequence_num.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1166 } | 1166 } |
1167 | 1167 |
1168 void Layer::PushPropertiesTo(LayerImpl* layer) { | 1168 void Layer::PushPropertiesTo(LayerImpl* layer) { |
1169 DCHECK(layer_tree_host_); | 1169 DCHECK(layer_tree_host_); |
1170 | 1170 |
1171 // If we did not SavePaintProperties() for the layer this frame, then push the | 1171 // If we did not SavePaintProperties() for the layer this frame, then push the |
1172 // real property values, not the paint property values. | 1172 // real property values, not the paint property values. |
1173 bool use_paint_properties = paint_properties_.source_frame_number == | 1173 bool use_paint_properties = paint_properties_.source_frame_number == |
1174 layer_tree_host_->source_frame_number(); | 1174 layer_tree_host_->source_frame_number(); |
1175 | 1175 |
| 1176 layer->draw_properties().is_clipped_from_property_trees = |
| 1177 draw_properties_.is_clipped_from_property_trees; |
| 1178 |
1176 layer->SetTransformOrigin(transform_origin_); | 1179 layer->SetTransformOrigin(transform_origin_); |
1177 layer->SetBackgroundColor(background_color_); | 1180 layer->SetBackgroundColor(background_color_); |
1178 layer->SetBounds(use_paint_properties ? paint_properties_.bounds | 1181 layer->SetBounds(use_paint_properties ? paint_properties_.bounds |
1179 : bounds_); | 1182 : bounds_); |
1180 | 1183 |
1181 if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots()) | 1184 if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots()) |
1182 layer->SetDebugInfo(TakeDebugInfo()); | 1185 layer->SetDebugInfo(TakeDebugInfo()); |
1183 | 1186 |
1184 layer->SetTransformTreeIndex(transform_tree_index()); | 1187 layer->SetTransformTreeIndex(transform_tree_index()); |
1185 layer->SetOpacityTreeIndex(opacity_tree_index()); | 1188 layer->SetOpacityTreeIndex(opacity_tree_index()); |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1659 ? layer_tree_host()->meta_information_sequence_number() | 1662 ? layer_tree_host()->meta_information_sequence_number() |
1660 : 0; | 1663 : 0; |
1661 } | 1664 } |
1662 | 1665 |
1663 bool Layer::sorted_for_recursion() { | 1666 bool Layer::sorted_for_recursion() { |
1664 return sorted_for_recursion_tracker_ == | 1667 return sorted_for_recursion_tracker_ == |
1665 layer_tree_host()->meta_information_sequence_number(); | 1668 layer_tree_host()->meta_information_sequence_number(); |
1666 } | 1669 } |
1667 | 1670 |
1668 } // namespace cc | 1671 } // namespace cc |
OLD | NEW |