| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 } | 493 } |
| 494 SetSubtreePropertyChanged(); | 494 SetSubtreePropertyChanged(); |
| 495 SetNeedsFullTreeSync(); | 495 SetNeedsFullTreeSync(); |
| 496 } | 496 } |
| 497 | 497 |
| 498 void Layer::SetFilters(const FilterOperations& filters) { | 498 void Layer::SetFilters(const FilterOperations& filters) { |
| 499 DCHECK(IsPropertyChangeAllowed()); | 499 DCHECK(IsPropertyChangeAllowed()); |
| 500 if (filters_ == filters) | 500 if (filters_ == filters) |
| 501 return; | 501 return; |
| 502 filters_ = filters; | 502 filters_ = filters; |
| 503 SetSubtreePropertyChanged(); |
| 503 SetNeedsCommit(); | 504 SetNeedsCommit(); |
| 504 } | 505 } |
| 505 | 506 |
| 506 bool Layer::FilterIsAnimating() const { | 507 bool Layer::FilterIsAnimating() const { |
| 507 DCHECK(layer_tree_host_); | 508 DCHECK(layer_tree_host_); |
| 508 return layer_animation_controller_ | 509 return layer_animation_controller_ |
| 509 ? layer_animation_controller_->IsCurrentlyAnimatingProperty( | 510 ? layer_animation_controller_->IsCurrentlyAnimatingProperty( |
| 510 TargetProperty::FILTER, | 511 TargetProperty::FILTER, |
| 511 LayerAnimationController::ObserverType::ACTIVE) | 512 LayerAnimationController::ObserverType::ACTIVE) |
| 512 : layer_tree_host_->IsAnimatingFilterProperty(this); | 513 : layer_tree_host_->IsAnimatingFilterProperty(this); |
| (...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2078 this, layer_tree_host_->property_trees()->transform_tree); | 2079 this, layer_tree_host_->property_trees()->transform_tree); |
| 2079 } | 2080 } |
| 2080 | 2081 |
| 2081 gfx::Transform Layer::screen_space_transform() const { | 2082 gfx::Transform Layer::screen_space_transform() const { |
| 2082 DCHECK_NE(transform_tree_index_, -1); | 2083 DCHECK_NE(transform_tree_index_, -1); |
| 2083 return ScreenSpaceTransformFromPropertyTrees( | 2084 return ScreenSpaceTransformFromPropertyTrees( |
| 2084 this, layer_tree_host_->property_trees()->transform_tree); | 2085 this, layer_tree_host_->property_trees()->transform_tree); |
| 2085 } | 2086 } |
| 2086 | 2087 |
| 2087 } // namespace cc | 2088 } // namespace cc |
| OLD | NEW |