MacViews: Change insertTextInternal to correctly handle IME character input.

ui/views/cocoa/bridged_content_view.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 419 matching lines @@
 
   if ([text isKindOfClass:[NSAttributedString class]])
     text = [text string];
 
   bool isCharacterEvent = keyDownEvent_ && [text length] == 1;
 
   // Forward the |text| to |textInputClient_| if no menu is active.
   if (textInputClient_ && ![self activeMenuController]) {
     // If a single character is inserted by keyDown's call to
     // interpretKeyEvents: then use InsertChar() to allow editing events to be
-    // merged.
-    if (isCharacterEvent)
-      textInputClient_->InsertChar(GetCharacterEventFromNSEvent(keyDownEvent_));
-    else
+    // merged. We use ui::VKEY_UNKOWN as the key code since it's not feasible to
+    // determine the correct key code for each unicode character. Also a correct
+    // keycode is not needed in the current context. Send ui::EF_NONE as the key
+    // modifier since |text| already accounts for the pressed key modifiers.

[tapted, 2016/07/28 02:01:06]

It might be worth raising a bug with the IME folks to just give `InsertText` a
boolean argument like "allow merge".. But this is OK for now

+
+    // Also, note we don't use |keyDownEvent_| to generate the synthetic
+    // ui::KeyEvent since for text inserted using an IME, [keyDownEvent_
+    // characters] might not be the same as |text|. This is because
+    // |keyDownEvent_| will correspond to the event that caused the composition
+    // text to be confirmed, say, Return key press.
+    if (isCharacterEvent) {
+      textInputClient_->InsertChar(ui::KeyEvent([text characterAtIndex:0],
+                                                ui::VKEY_UNKNOWN, ui::EF_NONE));
+    } else {
       textInputClient_->InsertText(base::SysNSStringToUTF16(text));
+    }
     return;
   }
 
   // Only handle the case where no. of characters is 1. Cases not handled (not
   // an exhaustive list):
   // - |text| contains a unicode surrogate pair, i.e. a single grapheme which
   //   requires two 16 bit characters. Currently Views menu only supports
   //   mnemonics using a single 16 bit character, so it is ok to ignore this
   //   case.
   // - Programmatically created events.
@@ skipping 828 matching lines @@
   }
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 @end