Pinch/Zoom Infrastructure & Plumbing CL

cc/animation/scrollbar_animation_controller_thinning.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/animation/scrollbar_animation_controller_thinning.h"
 
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 120 matching lines @@
 float
 ScrollbarAnimationControllerThinning::ThumbThicknessScaleAtAnimationProgress(
     float progress) {
   const float kIdleThicknessScale = 0.4f;
 
   return ((1.f - kIdleThicknessScale) * (1.f - progress)) + kIdleThicknessScale;
 }
 
 void ScrollbarAnimationControllerThinning::ApplyOpacityAndThumbThicknessScale(
     float opacity, float thumb_thickness_scale) {
-  ScrollbarLayerImplBase* horizontal_scrollbar =
-      scroll_layer_->horizontal_scrollbar_layer();
-  if (horizontal_scrollbar) {
-    horizontal_scrollbar->SetOpacity(opacity);
-    horizontal_scrollbar->set_thumb_thickness_scale_factor(
-        thumb_thickness_scale);
-  }
+  if (!scroll_layer_->scrollbars())
+    return;
 
-  ScrollbarLayerImplBase* vertical_scrollbar =
-      scroll_layer_->vertical_scrollbar_layer();
-  if (vertical_scrollbar) {
-    vertical_scrollbar->SetOpacity(opacity);
-    vertical_scrollbar->set_thumb_thickness_scale_factor(thumb_thickness_scale);
+  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);
+      scrollbar->set_thumb_thickness_scale_factor(thumb_thickness_scale);
+    }
   }
 }
 
 }  // namespace cc