MacViews: Don't InsertChar() for consumed events.

ui/views/controls/textfield/textfield_unittest.cc

 // 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.
 
 #include "ui/views/controls/textfield/textfield.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 139 matching lines @@
     *result = NativeEventResult();
   return false;
 }
 
 ui::EventDispatchDetails MockInputMethod::DispatchKeyEvent(ui::KeyEvent* key) {
 // On Mac, emulate InputMethodMac behavior for character events. Composition
 // still needs to be mocked, since it's not possible to generate test events
 // which trigger the appropriate NSResponder action messages for composition.
 #if defined(OS_MACOSX)
   if (key->is_char())
     return DispatchKeyEventPostIME(key);

[tapted, 2017/07/04 08:13:15]

Note Mac bails out of this function up here -- it didn't need the change on line
185. But it's a bug for MockInputMethod not do have the stuff on line 185 for
other platforms (coincidentally, almost the same bug that BridgedContentView
had)

[msw, 2017/07/05 19:21:21]

Acknowledged.

 #endif
 
   // Checks whether the key event is from EventGenerator on Windows which will
   // generate key event for WM_CHAR.
   // The MockInputMethod will insert char on WM_KEYDOWN so ignore WM_CHAR here.
   if (key->is_char() && key->HasNativeEvent()) {
     key->SetHandled();
     return ui::EventDispatchDetails();
   }
 
   ui::EventDispatchDetails dispatch_details;
 
   bool handled = !IsTextInputTypeNone() && HasComposition();
   ClearStates();
   if (handled) {
     DCHECK(!key->is_char());
     ui::KeyEvent mock_key(ui::ET_KEY_PRESSED,
                           ui::VKEY_PROCESSKEY,
                           key->flags());
     dispatch_details = DispatchKeyEventPostIME(&mock_key);
   } else {
     dispatch_details = DispatchKeyEventPostIME(key);
   }
 
-  if (dispatch_details.dispatcher_destroyed)
+  if (key->handled() || dispatch_details.dispatcher_destroyed)
     return dispatch_details;
 
   ui::TextInputClient* client = GetTextInputClient();
   if (client) {
     if (handled) {
       if (result_text_.length())
         client->InsertText(result_text_);
       if (composition_.text.length())
         client->SetCompositionText(composition_);
       else
@@ skipping 145 matching lines @@
     if (target_)
       target_->OnBlur();
     target_.reset();
     return false;
   }
 
  private:
   std::unique_ptr<views::Textfield> target_;
 };
 
+// Class that focuses a textfield when it sees a KeyDown event.
+class TextfieldFocuser : public views::View {
+ public:
+  explicit TextfieldFocuser(views::Textfield* textfield)
+      : textfield_(textfield) {
+    SetFocusBehavior(FocusBehavior::ALWAYS);
+  }
+
+  void PretendNotConsumed() { consume_ = false; }

[msw, 2017/07/05 19:21:21]

nit: do a simple |void set_consume(bool consume) { consume_ = consume; }|

[tapted, 2017/07/06 05:58:07]

Done.

+
+  // View:
+  bool OnKeyPressed(const ui::KeyEvent& event) override {
+    textfield_->RequestFocus();
+    return consume_;
+  }
+
+ private:
+  bool consume_ = true;
+  views::Textfield* textfield_;
+
+  DISALLOW_COPY_AND_ASSIGN(TextfieldFocuser);
+};
+
 base::string16 GetClipboardText(ui::ClipboardType type) {
   base::string16 text;
   ui::Clipboard::GetForCurrentThread()->ReadText(type, &text);
   return text;
 }
 
 void SetClipboardText(ui::ClipboardType type, const std::string& text) {
   ui::ScopedClipboardWriter(type).WriteText(ASCIIToUTF16(text));
 }
 
@@ skipping 2800 matching lines @@
 TEST_F(TextfieldTest, CursorVisibility) {
   InitTextfield();
 
   textfield_->SetCursorEnabled(false);
   EXPECT_FALSE(test_api_->IsCursorVisible());
 
   textfield_->SetCursorEnabled(true);
   EXPECT_TRUE(test_api_->IsCursorVisible());
 }
 
+// Verify that if a textfield gains focus during key dispatch that an edit
+// command only results when the event is not consumed.
+TEST_F(TextfieldTest, SwitchFocusInKeyDown) {
+  InitTextfield();
+  TextfieldFocuser* focuser = new TextfieldFocuser(textfield_);
+  widget_->GetContentsView()->AddChildView(focuser);
+
+  focuser->RequestFocus();
+  EXPECT_EQ(focuser, GetFocusedView());
+  SendKeyPress(ui::VKEY_SPACE, 0);
+  EXPECT_EQ(textfield_, GetFocusedView());
+  EXPECT_EQ(base::string16(), textfield_->text());
+
+  focuser->PretendNotConsumed();
+  focuser->RequestFocus();
+  EXPECT_EQ(focuser, GetFocusedView());
+  SendKeyPress(ui::VKEY_SPACE, 0);
+  EXPECT_EQ(textfield_, GetFocusedView());
+  EXPECT_EQ(base::ASCIIToUTF16(" "), textfield_->text());
+}
+
 }  // namespace views