input: Make the OverscrollController less intrusive, and some code cleanup.

content/browser/renderer_host/input/buffered_input_router.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_INPUT_RENDERER_HOST_BUFFERED_INPUT_ROUTER_H_
 #define CONTENT_BROWSER_INPUT_RENDERER_HOST_BUFFERED_INPUT_ROUTER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 49 matching lines @@
   virtual void SendMouseEventImmediately(
       const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
   virtual void SendTouchEventImmediately(
       const TouchEventWithLatencyInfo& touch_event) OVERRIDE;
   virtual void SendGestureEventImmediately(
       const GestureEventWithLatencyInfo& gesture_event) OVERRIDE;
   virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const OVERRIDE;
   virtual bool ShouldForwardTouchEvent() const OVERRIDE;
   virtual bool ShouldForwardGestureEvent(
       const GestureEventWithLatencyInfo& gesture_event) const OVERRIDE;
-  virtual bool HasQueuedGestureEvents() const OVERRIDE;
 
   // InputQueueClient
   virtual void Deliver(const EventPacket& packet) OVERRIDE;
   virtual void DidFinishFlush() OVERRIDE;
   virtual void SetNeedsFlush() OVERRIDE;
 
   // BrowserInputEventClient
   virtual void OnDispatched(const BrowserInputEvent& event,
                             InputEventDisposition disposition) OVERRIDE;
   // Events delivered to the router within the scope of
@@ skipping 37 matching lines @@
   int routing_id_;
 
   scoped_ptr<InputQueue> input_queue_;
 
   // TODO(jdduke): Remove when we can properly serialize NativeWebKeyboardEvent.
   // Alternatively, attach WebInputEvents to InputEvents but don't serialize.
   typedef std::map<int64, NativeWebKeyboardEvent> KeyMap;
   KeyMap queued_key_map_;
 
   // Necessary for |HasQueuedGestureEvents()|.
   int queued_gesture_count_;

[jdduke (slow), 2013/09/12 16:32:35]

Could you nuke this variable and the code where it's
initialized/incremented/decremented?

[sadrul, 2013/09/12 17:31:20]

Done.

 
   // Necessary for |ShouldForwardTouchEvent()|.
   bool has_touch_handler_;
   int queued_touch_count_;
 
   // This is non-NULL ONLY in the scope of OnInputEventAck(event, injector).
   ScopedVector<BrowserInputEvent>* input_queue_override_;
 
   // Used to assign unique ID's to each InputEvent that is generated.
   int64 next_input_id_;
 
   // 0 if there no in-flight EventPacket.
   int64 in_flight_packet_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedInputRouter);
 };
 
 } // namespace content
 
 #endif // CONTENT_BROWSER_INPUT_RENDERER_HOST_BUFFERED_INPUT_ROUTER_H_