Merge 236478 "Update accept_return_character_ for synthetic even..."

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.cc	(revision 236933)
+++ content/browser/renderer_host/render_widget_host_view_aura.cc	(working copy)
@@ -2578,6 +2578,10 @@
       host_->Shutdown();
     }
   } else {
+    // Accept return key character events between its press and release events.
+    if (event->key_code() == ui::VKEY_RETURN)
+      accept_return_character_ = event->type() == ui::ET_KEY_PRESSED;
+
     // We don't have to communicate with an input method here.
     if (!event->HasNativeEvent()) {
       NativeWebKeyboardEvent webkit_event(
@@ -2588,8 +2592,6 @@
           ui::EventTimeForNow().InSecondsF());
       host_->ForwardKeyboardEvent(webkit_event);
     } else {
-      if (event->key_code() == ui::VKEY_RETURN)
-        accept_return_character_ = event->type() == ui::ET_KEY_PRESSED;
       NativeWebKeyboardEvent webkit_event(event);
       host_->ForwardKeyboardEvent(webkit_event);
     }