[android] Remove unused scroll delta in TopControls

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 2567 matching lines @@
     return false;
 
   // Always consume if it's in the direction to show the top controls.
   if (scroll_delta.y() < 0)
     return true;
 
   if (CurrentlyScrollingLayer() != InnerViewportScrollLayer() &&
       CurrentlyScrollingLayer() != OuterViewportScrollLayer())
     return false;
 
+  // Avoid confusing top controls bookkeeping with positive overscroll deltas.
+  if (scroll_delta.y() > 0 && top_controls_manager_->ContentTopOffset() == 0 &&
+      (InnerViewportScrollLayer()->TotalScrollOffset().y() ==

[aelias_OOO_until_Jul13, 2014/10/22 18:40:47]

This should check OuterViewportScrollLayer as well, and be merged with the other
MaxScrollOffset checks below.  I also don't see the reason to look at
scroll_delta again nor ContentTopOffset.  Please rewrite these three if
statements as:

if (active_tree()->TotalScrollOffset().y() <
active_tree()->TotalMaxScrollOffset().y())
  return true;

return false;

[sujith, 2014/10/23 06:57:10]

Done.

+       InnerViewportScrollLayer()->MaxScrollOffset().y()))
+    return false;
+
   if (InnerViewportScrollLayer()->MaxScrollOffset().y() > 0)
     return true;
 
   if (OuterViewportScrollLayer() &&
       OuterViewportScrollLayer()->MaxScrollOffset().y() > 0)
     return true;
 
   return false;
 }
 
@@ skipping 875 matching lines @@
 }
 
 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) {
   std::vector<PictureLayerImpl*>::iterator it =
       std::find(picture_layers_.begin(), picture_layers_.end(), layer);
   DCHECK(it != picture_layers_.end());
   picture_layers_.erase(it);
 }
 
 }  // namespace cc