Fix issue 23221: accesskey is not supported on Chromium Mac....

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // 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_view_mac.h"
 
 #include "base/histogram.h"
 #import "base/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 685 matching lines @@
 
     // We don't get insertText: calls if ctrl is down and not even a keyDown:
     // call if cmd is down, so synthesize a keypress event for these cases.
     // Note that this makes our behavior deviate from the windows and linux
     // versions of chrome (however, see http://crbug.com/13891 ), but it makes
     // us behave similar to how Safari behaves.
     if ([theEvent modifierFlags] & (NSControlKeyMask | NSCommandKeyMask) &&
         lastKeyPressedEvent_.get() != theEvent &&
         [[theEvent characters] length] > 0 &&
         renderWidgetHostView_->render_widget_host_) {
-      NativeWebKeyboardEvent event([[theEvent characters] characterAtIndex:0],
-                                   ToWebKitModifiers([theEvent modifierFlags]),
-                                   base::Time::Now().ToDoubleT());
+      // Just fabricate a Char event by changing the type of the RawKeyDown
+      // event, to retain all necessary informations, such as unmodifiedText.
+      event.type = WebKit::WebInputEvent::Char;
       // We fire menu items on keydown, we don't want to activate menu items
       // twice.
       event.skip_in_browser = true;
       renderWidgetHostView_->render_widget_host_->ForwardKeyboardEvent(event);
     }
   }
 
   // Possibly autohide the cursor.
   if ([RenderWidgetHostViewCocoa shouldAutohideCursorForEvent:theEvent])
     [NSCursor setHiddenUntilMouseMoves:YES];
@@ skipping 626 matching lines @@
 - (void)doCommandBySelector:(SEL)selector {
   // An input method calls this function to dispatch an editing command to be
   // handled by this view.
   // Even though most editing commands has been already handled by the
   // RWHVMEditCommandHelper object, we need to handle an insertNewline: command
   // and send a '\r' character to WebKit so that WebKit dispatches this
   // character to onkeypress() event handlers.
   // TODO(hbono): need to handle more commands?
   if (selector == @selector(insertNewline:)) {
     lastKeyPressedEvent_.reset([[NSApp currentEvent] retain]);
-    NativeWebKeyboardEvent event('\r', renderWidgetHostView_->im_modifiers_,
-                                 base::Time::Now().ToDoubleT());
+    // Create the Char event from the NSEvent object, so that we can retain
+    // necessary informations, especially unmodifiedText.
+    NativeWebKeyboardEvent event(lastKeyPressedEvent_.get());
+    event.type = WebKit::WebInputEvent::Char;
+    event.text[0] = '\r';
+    event.text[1] = 0;
+    event.skip_in_browser = true;
     renderWidgetHostView_->render_widget_host_->ForwardKeyboardEvent(event);
   }
 }
 
 - (void)insertText:(id)string {
   // An input method has characters to be inserted.
   // Same as Linux, Mac calls this method not only:
   // * when an input method finishs composing text, but also;
   // * when we type an ASCII character (without using input methods).
   // When we aren't using input methods, we should send the given character as
   // a Char event so it is dispatched to an onkeypress() event handler of
   // JavaScript.
   // On the other hand, when we are using input methods, we should send the
   // given characters as an IME event and prevent the characters from being
   // dispatched to onkeypress() event handlers.
   BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
   NSString* im_text = isAttributedString ? [string string] : string;
   if (!renderWidgetHostView_->im_composing_ && [im_text length] == 1) {
     lastKeyPressedEvent_.reset([[NSApp currentEvent] retain]);
-    NativeWebKeyboardEvent event([im_text characterAtIndex:0],
-                                 renderWidgetHostView_->im_modifiers_,
-                                 base::Time::Now().ToDoubleT());
+    // Create the Char event from the NSEvent object, so that we can retain
+    // necessary informations, especially unmodifiedText.
+    NativeWebKeyboardEvent event(lastKeyPressedEvent_.get());
+    event.type = WebKit::WebInputEvent::Char;
+    event.text[0] = [im_text characterAtIndex:0];
+    event.text[1] = 0;
+    event.skip_in_browser = true;
     renderWidgetHostView_->render_widget_host_->ForwardKeyboardEvent(event);
   } else {
     renderWidgetHostView_->render_widget_host_->ImeConfirmComposition(
         UTF8ToUTF16([im_text UTF8String]));
   }
   renderWidgetHostView_->im_composing_ = false;
 }
 
 @end