Pinch/Zoom Infrastructure & Plumbing CL

cc/animation/scrollbar_animation_controller_linear_fade.cc

Index: cc/animation/scrollbar_animation_controller_linear_fade.cc
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.cc b/cc/animation/scrollbar_animation_controller_linear_fade.cc
index 863959b84c27691f9afe1cca9628b399fc3b04e9..1ab4ee666ad5edb7fea0ba1ffd85a8e70e741e09 100644
--- a/cc/animation/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.cc
@@ -112,15 +112,17 @@ float ScrollbarAnimationControllerLinearFade::OpacityAtTime(
 
 void ScrollbarAnimationControllerLinearFade::ApplyOpacityToScrollbars(
     float opacity) {
-  ScrollbarLayerImplBase* horizontal_scrollbar =
-      scroll_layer_->horizontal_scrollbar_layer();
-  if (horizontal_scrollbar)
-    horizontal_scrollbar->SetOpacity(opacity);
-
-  ScrollbarLayerImplBase* vertical_scrollbar =
-      scroll_layer_->vertical_scrollbar_layer();
-  if (vertical_scrollbar)
-    vertical_scrollbar->SetOpacity(opacity);
+  if (!scroll_layer_->scrollbars())
+    return;
+
+  LayerImpl::ScrollbarSet* scrollbars = scroll_layer_->scrollbars();
+  for (LayerImpl::ScrollbarSet::iterator it = scrollbars->begin();
+       it != scrollbars->end();
+       ++it) {
+    ScrollbarLayerImplBase* scrollbar = *it;
+    if (scrollbar->opacity_can_animate())
+      scrollbar->SetOpacity(opacity);
+  }
 }
 
 }  // namespace cc