Index: cc/input/scrollbar_animation_controller.cc |
diff --git a/cc/input/scrollbar_animation_controller.cc b/cc/input/scrollbar_animation_controller.cc |
index b5a85d703cade5321313c783a2623eb91f183a20..4d41deb3034a7df0a2dc6073f49e4f2e441da45c 100644 |
--- a/cc/input/scrollbar_animation_controller.cc |
+++ b/cc/input/scrollbar_animation_controller.cc |
@@ -365,22 +365,7 @@ void ScrollbarAnimationController::ApplyOpacityToScrollbars(float opacity) { |
if (!scrollbar->is_overlay_scrollbar()) |
continue; |
float effective_opacity = scrollbar->CanScrollOrientation() ? opacity : 0; |
- PropertyTrees* property_trees = |
- scrollbar->layer_tree_impl()->property_trees(); |
- // If this method is called during LayerImpl::PushPropertiesTo, we may not |
- // yet have valid owning_layer_id_to_node_index entries in effect tree as |
- // property trees are pushed after layers during activation. We can skip |
- // updating opacity in that case as we are only registering a scrollbar and |
- // because opacity will be overwritten anyway when property trees are |
- // pushed. |
- if (property_trees->effect_tree.FindNodeIndexFromOwningLayerId( |
- scrollbar->id()) != EffectTree::kInvalidNodeId) { |
- property_trees->effect_tree.OnOpacityAnimated( |
- effective_opacity, |
- property_trees->effect_tree.FindNodeIndexFromOwningLayerId( |
- scrollbar->id()), |
- scrollbar->layer_tree_impl()); |
- } |
+ scrollbar->SetOverlayScrollbarLayerOpacityAnimated(effective_opacity); |
} |
bool previouslyVisible = opacity_ > 0.0f; |