Refactor the keyboard events handling code related to RenderViewHostDelegate:...

chrome/renderer/render_widget.cc

 // Copyright (c) 2009 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 "chrome/renderer/render_widget.h"
 
 #include "base/command_line.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
       handling_input_event_(false),
       closing_(false),
       ime_is_active_(false),
       ime_control_enable_ime_(true),
       ime_control_x_(-1),
       ime_control_y_(-1),
       ime_control_new_state_(false),
       ime_control_updated_(false),
       ime_control_busy_(false),
       activatable_(activatable),
-      pending_window_rect_count_(0) {
+      pending_window_rect_count_(0),
+      suppress_next_char_events_(false) {
   RenderProcess::current()->AddRefProcess();
   DCHECK(render_thread_);
 }
 
 RenderWidget::~RenderWidget() {
   DCHECK(!webwidget_) << "Leaking our WebWidget!";
   if (current_paint_buf_) {
     RenderProcess::current()->ReleaseTransportDIB(current_paint_buf_);
     current_paint_buf_ = NULL;
   }
@@ skipping 216 matching lines @@
   const char* data;
   int data_length;
   handling_input_event_ = true;
   if (!message.ReadData(&iter, &data, &data_length)) {
     handling_input_event_ = false;
     return;
   }
 
   const WebInputEvent* input_event =
       reinterpret_cast<const WebInputEvent*>(data);
+
+  bool is_keyboard_shortcut = false;
+  // is_keyboard_shortcut flag is only available for RawKeyDown events.
+  if (input_event->type == WebInputEvent::RawKeyDown)
+    message.ReadBool(&iter, &is_keyboard_shortcut);
+
   bool processed = false;
-  if (webwidget_)
-    processed = webwidget_->handleInputEvent(*input_event);
+  if (input_event->type != WebInputEvent::Char || !suppress_next_char_events_) {
+    suppress_next_char_events_ = false;
+    if (webwidget_)
+      processed = webwidget_->handleInputEvent(*input_event);
+  }
+
+  // If this RawKeyDown event corresponds to a browser keyboard shortcut and
+  // it's not processed by webkit, then we need to suppress the upcoming Char
+  // events.
+  if (!processed && is_keyboard_shortcut)
+    suppress_next_char_events_ = true;
 
   IPC::Message* response = new ViewHostMsg_HandleInputEvent_ACK(routing_id_);
   response->WriteInt(input_event->type);
   response->WriteBool(processed);
 
   if (input_event->type == WebInputEvent::MouseMove &&
       paint_aggregator_.HasPendingUpdate()) {
     // We want to rate limit the input events in this case, so we'll wait for
     // painting to finish before ACKing this message.
     pending_input_event_ack_.reset(response);
   } else {
     Send(response);
   }
 
   handling_input_event_ = false;
 
-  WebInputEvent::Type type = input_event->type;
-  if (type == WebInputEvent::RawKeyDown || type == WebInputEvent::KeyDown ||
-      type == WebInputEvent::KeyUp || type == WebInputEvent::Char)
+  if (WebInputEvent::isKeyboardEventType(input_event->type))
     DidHandleKeyEvent();
 }
 
 void RenderWidget::OnMouseCaptureLost() {
   if (webwidget_)
     webwidget_->mouseCaptureLost();
 }
 
 void RenderWidget::OnSetFocus(bool enable) {
   has_focus_ = enable;
@@ skipping 529 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }