Move nonscrollable axis gloweffect suppression to renderer.

content/browser/android/overscroll_glow.cc

 // Copyright (c) 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 "content/browser/android/overscroll_glow.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/threading/worker_pool.h"
 #include "cc/layers/image_layer.h"
@@ skipping 79 matching lines @@
   // Don't block the main thread with effect resource loading during creation.
   // Effect instantiation is deferred until the effect overscrolls, in which
   // case the main thread may block until the resource has loaded.
   if (enabled && g_overscroll_resources == NULL)
     base::WorkerPool::PostTask(FROM_HERE, base::Bind(EnsureResources), true);
 
   return make_scoped_ptr(new OverscrollGlow(enabled));
 }
 
 OverscrollGlow::OverscrollGlow(bool enabled)
-  : enabled_(enabled),
-    initialized_(false),
-    horizontal_overscroll_enabled_(true),
-    vertical_overscroll_enabled_(true) {}
+    : enabled_(enabled), initialized_(false) {}
 
 OverscrollGlow::~OverscrollGlow() {
   Detach();
 }
 
 void OverscrollGlow::Enable() {
   enabled_ = true;
 }
 
 void OverscrollGlow::Disable() {
@@ skipping 14 matching lines @@
   DCHECK(overscrolling_layer);
 
   if (!enabled_)
     return false;
 
   // The size of the glow determines the relative effect of the inputs; an
   // empty-sized effect is effectively disabled.
   if (size_.IsEmpty())
     return false;
 
-  if (!horizontal_overscroll_enabled_) {
-    overscroll.set_x(0);
-    velocity.set_x(0);
-  }
-  if (!vertical_overscroll_enabled_) {
-    overscroll.set_y(0);
-    velocity.set_y(0);
-  }
-
   // Ignore sufficiently small values that won't meaningfuly affect animation.
   overscroll = ZeroSmallComponents(overscroll);
   velocity = ZeroSmallComponents(velocity);
 
   if (overscroll.IsZero()) {
     if (initialized_) {
       Release(current_time);
       UpdateLayerAttachment(overscrolling_layer);
     }
     return NeedsAnimate();
@@ skipping 187 matching lines @@
   };
 }
 
 EdgeEffect* OverscrollGlow::GetOppositeEdge(int edge_index) {
   DCHECK(initialized_);
   return edge_effects_[(edge_index + 2) % EdgeEffect::EDGE_COUNT].get();
 }
 
 }  // namespace content