RenderWidgetHost now stores both the WebKeyboardEvent and the native

chrome/browser/renderer_host/render_widget_host.cc

 // Copyright (c) 2006-2008 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/browser/renderer_host/render_widget_host.h"
 
 #include "base/gfx/native_widget_types.h"
 #include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/keyboard_codes.h"
@@ skipping 273 matching lines @@
   }
 
   ForwardInputEvent(mouse_event, sizeof(WebMouseEvent));
 }
 
 void RenderWidgetHost::ForwardWheelEvent(
     const WebMouseWheelEvent& wheel_event) {
   ForwardInputEvent(wheel_event, sizeof(WebMouseWheelEvent));
 }
 
-void RenderWidgetHost::ForwardKeyboardEvent(const WebKeyboardEvent& key_event) {
+void RenderWidgetHost::ForwardKeyboardEvent(
+    const NativeWebKeyboardEvent& key_event) {
   if (key_event.type == WebKeyboardEvent::CHAR &&
       (key_event.windows_key_code == base::VKEY_RETURN ||
        key_event.windows_key_code == base::VKEY_SPACE)) {
     OnEnterOrSpace();
   }
 
+  if (WebInputEvent::IsKeyboardEventType(key_event.type)) {

[darin (slow to review), 2009/03/06 04:45:35]

previously, we would have only added to the queue if process_->channel() was
non-null.  that may be worth preserving.

[Elliot Glaysher, 2009/03/06 20:51:25]

Done.

+    // Put all WebKeyboardEvent objects in a queue since we can't trust the
+    // renderer and we need to give something to the UnhandledInputEvent
+    // handler.
+    key_queue_.push(key_event);
+    HISTOGRAM_COUNTS_100("Renderer.KeyboardQueueSize", key_queue_.size());
+  }
+
+  // Only forward the non-native portions of our event.
   ForwardInputEvent(key_event, sizeof(WebKeyboardEvent));
 }
 
 void RenderWidgetHost::ForwardInputEvent(const WebInputEvent& input_event,
                                          int event_size) {
   if (!process_->channel())
     return;
 
-  if (WebInputEvent::IsKeyboardEventType(input_event.type)) {
-    // Put all WebKeyboardEvent objects in a queue since we can't trust the
-    // renderer and we need to give something to the UnhandledInputEvent
-    // handler.
-    key_queue_.push(static_cast<const WebKeyboardEvent&>(input_event));
-    HISTOGRAM_COUNTS_100("Renderer.KeyboardQueueSize", key_queue_.size());
-  }
-
   IPC::Message* message = new ViewMsg_HandleInputEvent(routing_id_);
   message->WriteData(
       reinterpret_cast<const char*>(&input_event), event_size);
   input_event_start_time_ = TimeTicks::Now();
   Send(message);
 
   // Any input event cancels a pending mouse move event.
   next_mouse_move_.reset();
 
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kHungRendererDelayMs));
@@ skipping 235 matching lines @@
       ForwardMouseEvent(*next_mouse_move_);
     }
   }
 
   if (WebInputEvent::IsKeyboardEventType(type)) {
     if (key_queue_.size() == 0) {
       LOG(ERROR) << "Got a KeyEvent back from the renderer but we "
                  << "don't seem to have sent it to the renderer!";
     } else if (key_queue_.front().type != type) {
       LOG(ERROR) << "We seem to have a different key type sent from "
-                 << "the renderer. Ignoring event.";
+                 << "the renderer. (" << key_queue_.front().type << " vs. "
+                 << type << "). Ignoring event.";
     } else {
       bool processed = false;
       r = message.ReadBool(&iter, &processed);
       DCHECK(r);
 
       KeyQueue::value_type front_item = key_queue_.front();
       key_queue_.pop();
 
       if (!processed) {
         UnhandledKeyboardEvent(front_item);
@@ skipping 71 matching lines @@
 
   // TODO(darin): do we need to do something else if our backing store is not
   // the same size as the advertised view?  maybe we just assume there is a
   // full paint on its way?
   BackingStore* backing_store = BackingStoreManager::Lookup(this);
   if (!backing_store || (backing_store->size() != view_size))
     return;
   backing_store->ScrollRect(process_->process().handle(), bitmap, bitmap_rect,
                             dx, dy, clip_rect, view_size);
 }