| 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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 node->filters = filters; | 601 node->filters = filters; |
| 602 node->effect_changed = true; | 602 node->effect_changed = true; |
| 603 property_trees->changed = true; | 603 property_trees->changed = true; |
| 604 property_trees->effect_tree.set_needs_update(true); | 604 property_trees->effect_tree.set_needs_update(true); |
| 605 SetNeedsPushProperties(); | 605 SetNeedsPushProperties(); |
| 606 layer_tree_impl()->set_needs_update_draw_properties(); | 606 layer_tree_impl()->set_needs_update_draw_properties(); |
| 607 } | 607 } |
| 608 | 608 |
| 609 void LayerImpl::OnOpacityAnimated(float opacity) { | 609 void LayerImpl::OnOpacityAnimated(float opacity) { |
| 610 UpdatePropertyTreeOpacity(opacity); | 610 UpdatePropertyTreeOpacity(opacity); |
| 611 SetNeedsPushProperties(); | |
| 612 layer_tree_impl()->set_needs_update_draw_properties(); | 611 layer_tree_impl()->set_needs_update_draw_properties(); |
| 613 layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity); | 612 layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity); |
| 614 } | 613 } |
| 615 | 614 |
| 616 void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) { | 615 void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) { |
| 617 UpdatePropertyTreeTransform(transform); | 616 UpdatePropertyTreeTransform(transform); |
| 618 was_ever_ready_since_last_transform_animation_ = false; | 617 was_ever_ready_since_last_transform_animation_ = false; |
| 619 layer_tree_impl()->AddToTransformAnimationsMap(id(), transform); | 618 layer_tree_impl()->AddToTransformAnimationsMap(id(), transform); |
| 620 } | 619 } |
| 621 | 620 |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1196 .layer_transforms_should_scale_layer_contents) { | 1195 .layer_transforms_should_scale_layer_contents) { |
| 1197 return default_scale; | 1196 return default_scale; |
| 1198 } | 1197 } |
| 1199 | 1198 |
| 1200 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1199 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1201 ScreenSpaceTransform(), default_scale); | 1200 ScreenSpaceTransform(), default_scale); |
| 1202 return std::max(transform_scales.x(), transform_scales.y()); | 1201 return std::max(transform_scales.x(), transform_scales.y()); |
| 1203 } | 1202 } |
| 1204 | 1203 |
| 1205 } // namespace cc | 1204 } // namespace cc |
| OLD | NEW |