Revert r112160 ("Send one WebKeyboardEvent to the RenderWidget at a time.")

content/browser/renderer_host/render_widget_host.h

 // Copyright (c) 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 #pragma once
 
 #include <deque>
 #include <string>
@@ skipping 265 matching lines @@
   void StopHangMonitorTimeout();
 
   // Forwards the given message to the renderer. These are called by the view
   // when it has received a message.
   virtual void ForwardMouseEvent(const WebKit::WebMouseEvent& mouse_event);
   // Called when a mouse click activates the renderer.
   virtual void OnMouseActivate();
   void ForwardWheelEvent(const WebKit::WebMouseWheelEvent& wheel_event);
   void ForwardGestureEvent(const WebKit::WebGestureEvent& gesture_event);
   virtual void ForwardKeyboardEvent(const NativeWebKeyboardEvent& key_event);
-  virtual void ForwardNextKeyboardEvent();
   virtual void ForwardTouchEvent(const WebKit::WebTouchEvent& touch_event);
 
 
   // Update the text direction of the focused input element and notify it to a
   // renderer process.
   // These functions have two usage scenarios: changing the text direction
   // from a menu (as Safari does), and; changing the text direction when a user
   // presses a set of keys (as IE and Firefox do).
   // 1. Change the text direction from a menu.
   // In this scenario, we receive a menu event only once and we should update
@@ skipping 155 matching lines @@
 
 #if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   // Called by the view in response to AcceleratedSurfaceBuffersSwapped.
   static void AcknowledgeSwapBuffers(int32 route_id, int gpu_host_id);
   static void AcknowledgePostSubBuffer(int32 route_id, int gpu_host_id);
 #endif
 
  protected:
   // Internal implementation of the public Forward*Event() methods.
   void ForwardInputEvent(const WebKit::WebInputEvent& input_event,
-                         int event_size);
+                         int event_size, bool is_keyboard_shortcut);
 
   // Called when we receive a notification indicating that the renderer
   // process has gone. This will reset our state so that our state will be
   // consistent if a new renderer is created.
   void RendererExited(base::TerminationStatus status, int exit_code);
 
   // Retrieves an id the renderer can use to refer to its view.
   // This is used for various IPC messages, including plugins.
   gfx::NativeViewId GetNativeViewId() const;
 
@@ skipping 280 matching lines @@
   bool in_get_backing_store_;
 
   // Set when we call DidPaintRect/DidScrollRect on the view.
   bool view_being_painted_;
 
   // Used for UMA histogram logging to measure the time for a repaint view
   // operation to finish.
   base::TimeTicks repaint_start_time_;
 
   // Queue of keyboard events that we need to track.
-  struct Key {
-    Key(const NativeWebKeyboardEvent& event, bool is_shortcut)
-        : event(event), is_shortcut(is_shortcut) {
-    }
-    NativeWebKeyboardEvent event;
-    bool is_shortcut;
-  };
-  typedef std::deque<Key> KeyQueue;
+  typedef std::deque<NativeWebKeyboardEvent> KeyQueue;
 
   // A queue of keyboard events. We can't trust data from the renderer so we
   // stuff key events into a queue and pop them out on ACK, feeding our copy
   // back to whatever unhandled handler instead of the returned version.
   KeyQueue key_queue_;
 
   // Set to true if we shouldn't send input events from the render widget.
   bool ignore_input_events_;
 
   // Set when we update the text direction of the selected input element.
   bool text_direction_updated_;
   WebKit::WebTextDirection text_direction_;
 
   // Set when we cancel updating the text direction.
   // This flag also ignores succeeding update requests until we call
   // NotifyTextDirection().
   bool text_direction_canceled_;
 
   // Indicates if the next sequence of Char events should be suppressed or not.
-  //
-  // The system may translate a RawKeyDown event into zero or more Char events,
+  // System may translate a RawKeyDown event into zero or more Char events,
   // usually we send them to the renderer directly in sequence. However, If a
-  // RawKeyDown event was not handled by the renderer but was handled by our
-  // UnhandledKeyboardEvent() method, e.g. as an accelerator key, then we shall
-  // not send the following sequence of Char events, which was generated by
-  // this RawKeyDown event, to the renderer. Otherwise the renderer may handle
-  // the Char events and cause unexpected behavior.  For example, pressing
-  // alt-2 may let the browser switch to the second tab, but the Char event
-  // generated by alt-2 may also activate a HTML element if its accesskey
-  // happens to be "2", then the user may get confused when switching back to
-  // the original tab, because the content may already be changed.
-  //
-  // If true, suppress_incoming_char_events_ prevents Char events from being
-  // added to key_queue_.
-  //
-  // If true, suppress_outgoing_char_events_ prevents Char events from being
-  // removed from key_queue_ and forwarded to the renderer.
-  //
-  bool suppress_incoming_char_events_;
-  bool suppress_outgoing_char_events_;
+  // RawKeyDown event was not handled by the renderer but was handled by
+  // our UnhandledKeyboardEvent() method, e.g. as an accelerator key, then we
+  // shall not send the following sequence of Char events, which was generated
+  // by this RawKeyDown event, to the renderer. Otherwise the renderer may
+  // handle the Char events and cause unexpected behavior.
+  // For example, pressing alt-2 may let the browser switch to the second tab,
+  // but the Char event generated by alt-2 may also activate a HTML element
+  // if its accesskey happens to be "2", then the user may get confused when
+  // switching back to the original tab, because the content may already be
+  // changed.
+  bool suppress_next_char_events_;
 
   std::vector<gfx::PluginWindowHandle> deferred_plugin_handles_;
 
   // The last scroll offset of the render widget.
   gfx::Point last_scroll_offset_;
 
   bool pending_mouse_lock_request_;
 
   base::WeakPtrFactory<RenderWidgetHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_