[Android] Avoid setting update_draw_properties.

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 1277 matching lines @@
         scrollbar_layer->SetVisibleToTotalLengthRatio(visible_ratio);
   } else {
     float visible_ratio = clip_rect.height() / scroll_rect.height();
     scrollbar_needs_animation |=
         scrollbar_layer->SetCurrentPos(current_offset.y());
     scrollbar_needs_animation |=
         scrollbar_layer->SetMaximum(scroll_rect.height() - clip_rect.height());
     scrollbar_needs_animation |=
         scrollbar_layer->SetVisibleToTotalLengthRatio(visible_ratio);
   }
-
-  layer_tree_impl()->set_needs_update_draw_properties();
-  // TODO(wjmaclean) The scrollbar animator for the pinch-zoom scrollbars should
-  // activate for every scroll on the main frame, not just the scrolls that move
-  // the pinch virtual viewport (i.e. trigger from either inner or outer
-  // viewport).
-  if (scrollbar_animation_controller_ && scrollbar_needs_animation) {
-    // 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)
-      scrollbar_animation_controller_->DidScrollUpdate();
+  if (scrollbar_needs_animation) {
+    layer_tree_impl()->set_needs_update_draw_properties();
+    // TODO(wjmaclean) The scrollbar animator for the pinch-zoom scrollbars

[wjmaclean, 2014/09/23 14:30:13]

nit: please reformat this comment

[MuVen, 2014/09/23 14:44:08]

Done.

+    // should
+    // activate for every scroll on the main frame, not just the scrolls that
+    // move
+    // the pinch virtual viewport (i.e. trigger from 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)
+        scrollbar_animation_controller_->DidScrollUpdate();
+    }
   }
 }
 
 void LayerImpl::DidBecomeActive() {
   if (layer_tree_impl_->settings().scrollbar_animator ==
       LayerTreeSettings::NoAnimator) {
     return;
   }
 
   bool need_scrollbar_animation_controller = scrollable() && scrollbars_;
@@ skipping 223 matching lines @@
 }
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
     Animation::TargetProperty target_property) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
 }  // namespace cc