Pinch/Zoom Infrastructure & Plumbing CL

cc/animation/scrollbar_animation_controller_linear_fade.cc

 // Copyright 2012 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_linear_fade.h"
 
 #include "base/time/time.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/scrollbar_layer_impl_base.h"
 
@@ skipping 94 matching lines @@
     return 1.0f;
   if (delta < fadeout_delay_ + fadeout_length_) {
     return (fadeout_delay_ + fadeout_length_ - delta).InSecondsF() /
            fadeout_length_.InSecondsF();
   }
   return 0.0f;
 }
 
 void ScrollbarAnimationControllerLinearFade::ApplyOpacityToScrollbars(
     float opacity) {
-  ScrollbarLayerImplBase* horizontal_scrollbar =
-      scroll_layer_->horizontal_scrollbar_layer();
-  if (horizontal_scrollbar)
-    horizontal_scrollbar->SetOpacity(opacity);
+  if (!scroll_layer_->scrollbars())
+    return;
 
-  ScrollbarLayerImplBase* vertical_scrollbar =
-      scroll_layer_->vertical_scrollbar_layer();
-  if (vertical_scrollbar)
-    vertical_scrollbar->SetOpacity(opacity);
+  LayerImpl::ScrollbarSet* scrollbars = scroll_layer_->scrollbars();
+  for (LayerImpl::ScrollbarSet::iterator it = scrollbars->begin();
+       it != scrollbars->end();
+       ++it) {
+    ScrollbarLayerImplBase* scrollbar = *it;
+    if (scrollbar->is_overlay_scrollbar())
+      scrollbar->SetOpacity(opacity);
+  }
 }
 
 }  // namespace cc