[Android]Increase Scrollbar fade delay on Resize.

cc/layers/layer_impl.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/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
@@ skipping 43 matching lines @@
       should_flatten_transform_(true),
       layer_property_changed_(false),
       masks_to_bounds_(false),
       contents_opaque_(false),
       is_root_for_isolated_group_(false),
       use_parent_backface_visibility_(false),
       draw_checkerboard_for_missing_tiles_(false),
       draws_content_(false),
       hide_layer_and_subtree_(false),
       force_render_surface_(false),
+      delay_scrollbar_animation_(false),
       transform_is_invertible_(true),
       is_container_for_fixed_position_layers_(false),
       background_color_(0),
       opacity_(1.0),
       blend_mode_(SkXfermode::kSrcOver_Mode),
       num_descendants_that_draw_content_(0),
       draw_depth_(0.f),
       needs_push_properties_(false),
       num_dependents_need_push_properties_(0),
       sorting_context_id_(0),
@@ skipping 701 matching lines @@
   return gfx::ToCeiledSize(gfx::SizeF(bounds_.width() + bounds_delta_.x(),
                                       bounds_.height() + bounds_delta_.y()));
 }
 
 void LayerImpl::SetBounds(const gfx::Size& bounds) {
   if (bounds_ == bounds)
     return;
 
   bounds_ = bounds;
 
+  delay_scrollbar_animation_ = true;
   ScrollbarParametersDidChange();
+  delay_scrollbar_animation_ = false;
   if (masks_to_bounds())
     NoteLayerPropertyChangedForSubtree();
   else
     NoteLayerPropertyChanged();
 }
 
 void LayerImpl::SetBoundsDelta(const gfx::Vector2dF& bounds_delta) {
   if (bounds_delta_ == bounds_delta)
     return;
 
@@ skipping 507 matching lines @@
     // either inner or outer viewport).
     if (scrollbar_animation_controller_) {
       // When both non-overlay and overlay scrollbars are both present, don't
       // animate the overlay scrollbars when page scale factor is at the min.
       // Non-overlay scrollbars also shouldn't trigger animations.
       bool is_animatable_scrollbar =
           scrollbar_layer->is_overlay_scrollbar() &&
           ((layer_tree_impl()->total_page_scale_factor() >
             layer_tree_impl()->min_page_scale_factor()) ||
            !layer_tree_impl()->settings().use_pinch_zoom_scrollbars);
-      if (is_animatable_scrollbar)
+      if (is_animatable_scrollbar) {
+        base::TimeDelta delay;
+        if (delay_scrollbar_animation_)
+          delay = base::TimeDelta::FromMilliseconds(
+              layer_tree_impl()->settings().scrollbar_fade_extra_delay_ms);
+        else
+          delay = base::TimeDelta::FromMilliseconds(
+              layer_tree_impl()->settings().scrollbar_fade_delay_ms);
+        scrollbar_animation_controller_->SetDelayOnScrollbarAnimation(delay);
         scrollbar_animation_controller_->DidScrollUpdate();
+      }
     }
   }
 }
 
 void LayerImpl::DidBecomeActive() {
   if (layer_tree_impl_->settings().scrollbar_animator ==
       LayerTreeSettings::NoAnimator) {
     return;
   }
 
@@ skipping 224 matching lines @@
 }
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
     Animation::TargetProperty target_property) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
 }  // namespace cc