Revert of Early terminate flings when scrolling impossible

content/browser/android/in_process/synchronous_compositor_impl.h

 // Copyright 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/layer_scroll_offset_delegate.h"
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/port/common/input_event_ack_state.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace cc {
 class InputHandler;
+struct DidOverscrollParams;
 }
 
 namespace blink {
 class WebInputEvent;
 }
 
 namespace content {
 class InputHandlerManager;
-struct DidOverscrollParams;
 
 // The purpose of this class is to act as the intermediary between the various
 // components that make up the 'synchronous compositor mode' implementation and
 // expose their functionality via the SynchronousCompositor interface.
 // This class is created on the main thread but most of the APIs are called
 // from the Compositor thread.
 class SynchronousCompositorImpl
     : public cc::LayerScrollOffsetDelegate,
       public SynchronousCompositor,
       public SynchronousCompositorOutputSurfaceDelegate,
@@ skipping 40 matching lines @@
   virtual void SetTotalScrollOffset(const gfx::Vector2dF& new_value) OVERRIDE;
   virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE;
   virtual bool IsExternalFlingActive() const OVERRIDE;
   virtual void SetTotalPageScaleFactorAndLimits(
       float page_scale_factor,
       float min_page_scale_factor,
       float max_page_scale_factor) OVERRIDE;
   virtual void SetScrollableSize(const gfx::SizeF& scrollable_size) OVERRIDE;
 
   void SetInputHandler(cc::InputHandler* input_handler);
-  void DidOverscroll(const DidOverscrollParams& params);
+  void DidOverscroll(const cc::DidOverscrollParams& params);
   void DidStopFlinging();
 
  private:
   explicit SynchronousCompositorImpl(WebContents* contents);
   virtual ~SynchronousCompositorImpl();
   friend class WebContentsUserData<SynchronousCompositorImpl>;
 
   void DidCreateSynchronousOutputSurface(
       SynchronousCompositorOutputSurface* output_surface);
   bool CalledOnValidThread() const;
 
   SynchronousCompositorClient* compositor_client_;
   SynchronousCompositorOutputSurface* output_surface_;
   WebContents* contents_;
   cc::InputHandler* input_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_