| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index f4e4e85be18ef102de1e9b9cd6d2d4ca945e7108..0aa3b27394a80ddbf35c1c04426d6dc787e37082 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -557,25 +557,6 @@ void LayerImpl::UpdatePropertyTreeTransformIsAnimated(bool is_animated) {
|
| }
|
| }
|
|
|
| -void LayerImpl::UpdatePropertyTreeOpacity(float opacity) {
|
| - PropertyTrees* property_trees = layer_tree_impl()->property_trees();
|
| - if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id())) {
|
| - // A LayerImpl's own current state is insufficient for determining whether
|
| - // it owns an OpacityNode, since this depends on the state of the
|
| - // corresponding Layer at the time of the last commit. For example, an
|
| - // opacity animation might have been in progress at the time the last commit
|
| - // started, but might have finished since then on the compositor thread.
|
| - EffectNode* node = property_trees->effect_tree.Node(
|
| - property_trees->effect_id_to_index_map[id()]);
|
| - if (node->opacity == opacity)
|
| - return;
|
| - node->opacity = opacity;
|
| - node->effect_changed = true;
|
| - property_trees->changed = true;
|
| - property_trees->effect_tree.set_needs_update(true);
|
| - }
|
| -}
|
| -
|
| void LayerImpl::UpdatePropertyTreeForScrollingAndAnimationIfNeeded() {
|
| if (scrollable())
|
| UpdatePropertyTreeScrollOffset();
|
| @@ -606,12 +587,6 @@ void LayerImpl::OnFilterAnimated(const FilterOperations& filters) {
|
| layer_tree_impl()->set_needs_update_draw_properties();
|
| }
|
|
|
| -void LayerImpl::OnOpacityAnimated(float opacity) {
|
| - UpdatePropertyTreeOpacity(opacity);
|
| - layer_tree_impl()->set_needs_update_draw_properties();
|
| - layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity);
|
| -}
|
| -
|
| void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) {
|
| UpdatePropertyTreeTransform(transform);
|
| was_ever_ready_since_last_transform_animation_ = false;
|
|
|