Update from https://crrev.com/309717

cc/input/input_handler.h

 // 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.
 
 #ifndef CC_INPUT_INPUT_HANDLER_H_
 #define CC_INPUT_INPUT_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
@@ skipping 30 matching lines @@
   gfx::Vector2dF unused_scroll_delta;
 };
 
 class CC_EXPORT InputHandlerClient {
  public:
   virtual ~InputHandlerClient() {}
 
   virtual void WillShutdown() = 0;
   virtual void Animate(base::TimeTicks time) = 0;
   virtual void MainThreadHasStoppedFlinging() = 0;
+  virtual void ReconcileElasticOverscrollAndRootScroll() = 0;
 
  protected:
   InputHandlerClient() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputHandlerClient);
 };
 
 // The InputHandler is a way for the embedders to interact with the impl thread
 // side of the compositor implementation. There is one InputHandler per
@@ skipping 96 matching lines @@
   InputHandler() {}
   virtual ~InputHandler() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputHandler);
 };
 
 }  // namespace cc
 
 #endif  // CC_INPUT_INPUT_HANDLER_H_