| 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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 if (HasAnyAnimationTargetingProperty(TargetProperty::TRANSFORM)) { | 583 if (HasAnyAnimationTargetingProperty(TargetProperty::TRANSFORM)) { |
| 584 UpdatePropertyTreeTransformIsAnimated( | 584 UpdatePropertyTreeTransformIsAnimated( |
| 585 HasPotentiallyRunningTransformAnimation()); | 585 HasPotentiallyRunningTransformAnimation()); |
| 586 } | 586 } |
| 587 } | 587 } |
| 588 | 588 |
| 589 gfx::ScrollOffset LayerImpl::ScrollOffsetForAnimation() const { | 589 gfx::ScrollOffset LayerImpl::ScrollOffsetForAnimation() const { |
| 590 return CurrentScrollOffset(); | 590 return CurrentScrollOffset(); |
| 591 } | 591 } |
| 592 | 592 |
| 593 void LayerImpl::OnFilterAnimated(const FilterOperations& filters) { | |
| 594 layer_tree_impl()->AddToFilterAnimationsMap(id(), filters); | |
| 595 PropertyTrees* property_trees = layer_tree_impl()->property_trees(); | |
| 596 DCHECK( | |
| 597 property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id())); | |
| 598 EffectNode* node = property_trees->effect_tree.Node(effect_tree_index()); | |
| 599 if (node->filters == filters) | |
| 600 return; | |
| 601 node->filters = filters; | |
| 602 node->effect_changed = true; | |
| 603 property_trees->changed = true; | |
| 604 property_trees->effect_tree.set_needs_update(true); | |
| 605 SetNeedsPushProperties(); | |
| 606 layer_tree_impl()->set_needs_update_draw_properties(); | |
| 607 } | |
| 608 | |
| 609 void LayerImpl::OnOpacityAnimated(float opacity) { | 593 void LayerImpl::OnOpacityAnimated(float opacity) { |
| 610 UpdatePropertyTreeOpacity(opacity); | 594 UpdatePropertyTreeOpacity(opacity); |
| 611 layer_tree_impl()->set_needs_update_draw_properties(); | 595 layer_tree_impl()->set_needs_update_draw_properties(); |
| 612 layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity); | 596 layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity); |
| 613 } | 597 } |
| 614 | 598 |
| 615 void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) { | 599 void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) { |
| 616 UpdatePropertyTreeTransform(transform); | 600 UpdatePropertyTreeTransform(transform); |
| 617 was_ever_ready_since_last_transform_animation_ = false; | 601 was_ever_ready_since_last_transform_animation_ = false; |
| 618 layer_tree_impl()->AddToTransformAnimationsMap(id(), transform); | 602 layer_tree_impl()->AddToTransformAnimationsMap(id(), transform); |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1195 .layer_transforms_should_scale_layer_contents) { | 1179 .layer_transforms_should_scale_layer_contents) { |
| 1196 return default_scale; | 1180 return default_scale; |
| 1197 } | 1181 } |
| 1198 | 1182 |
| 1199 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1183 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1200 ScreenSpaceTransform(), default_scale); | 1184 ScreenSpaceTransform(), default_scale); |
| 1201 return std::max(transform_scales.x(), transform_scales.y()); | 1185 return std::max(transform_scales.x(), transform_scales.y()); |
| 1202 } | 1186 } |
| 1203 | 1187 |
| 1204 } // namespace cc | 1188 } // namespace cc |
| OLD | NEW |