BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

8 files changed, 37 insertions, 29 deletions

diff --git a/chromium/ui/base/ime/BUILD.gn b/chromium/ui/base/ime/BUILD.gn
index 281a28bc104..ef52921ebc2 100644
--- a/chromium/ui/base/ime/BUILD.gn
+++ b/chromium/ui/base/ime/BUILD.gn
@@ -194,6 +194,10 @@ component("ime") {
     libs = [ "imm32.lib" ]
   }
 
+  if (is_mac) {
+    libs = [ "AppKit.framework" ]
+  }
+
   if (use_ozone) {
     deps += [
       "//ui/events/ozone:events_ozone_layout",
diff --git a/chromium/ui/base/ime/input_method_base.cc b/chromium/ui/base/ime/input_method_base.cc
index 37c4d90a1ba..9d43d8523a8 100644
--- a/chromium/ui/base/ime/input_method_base.cc
+++ b/chromium/ui/base/ime/input_method_base.cc
@@ -22,9 +22,8 @@ InputMethodBase::InputMethodBase()
       text_input_client_(nullptr) {}
 
 InputMethodBase::~InputMethodBase() {
-  FOR_EACH_OBSERVER(InputMethodObserver,
-                    observer_list_,
-                    OnInputMethodDestroyed(this));
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnInputMethodDestroyed(this);
   if (ui::IMEBridge::Get() &&
       ui::IMEBridge::Get()->GetInputContextHandler() == this)
     ui::IMEBridge::Get()->SetInputContextHandler(nullptr);
@@ -93,7 +92,8 @@ bool InputMethodBase::CanComposeInline() const {
 }
 
 void InputMethodBase::ShowImeIfNeeded() {
-  FOR_EACH_OBSERVER(InputMethodObserver, observer_list_, OnShowImeIfNeeded());
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnShowImeIfNeeded();
 }
 
 void InputMethodBase::AddObserver(InputMethodObserver* observer) {
@@ -128,15 +128,14 @@ ui::EventDispatchDetails InputMethodBase::DispatchKeyEventPostIME(
 
 void InputMethodBase::NotifyTextInputStateChanged(
     const TextInputClient* client) {
-  FOR_EACH_OBSERVER(InputMethodObserver,
-                    observer_list_,
-                    OnTextInputStateChanged(client));
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnTextInputStateChanged(client);
 }
 
 void InputMethodBase::NotifyTextInputCaretBoundsChanged(
     const TextInputClient* client) {
-  FOR_EACH_OBSERVER(
-      InputMethodObserver, observer_list_, OnCaretBoundsChanged(client));
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnCaretBoundsChanged(client);
 }
 
 void InputMethodBase::SetFocusedTextInputClientInternal(
diff --git a/chromium/ui/base/ime/input_method_factory.cc b/chromium/ui/base/ime/input_method_factory.cc
index 91f2bd799e8..f0ed9e28545 100644
--- a/chromium/ui/base/ime/input_method_factory.cc
+++ b/chromium/ui/base/ime/input_method_factory.cc
@@ -14,8 +14,7 @@
 #include "ui/base/ime/input_method_win.h"
 #elif defined(OS_MACOSX)
 #include "ui/base/ime/input_method_mac.h"
-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
-      !defined(OS_CHROMEOS)
+#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11)
 #include "ui/base/ime/input_method_auralinux.h"
 #elif defined(OS_ANDROID)
 #include "ui/base/ime/input_method_android.h"
@@ -56,8 +55,7 @@ std::unique_ptr<InputMethod> CreateInputMethod(
   return base::MakeUnique<InputMethodWin>(delegate, widget);
 #elif defined(OS_MACOSX)
   return base::MakeUnique<InputMethodMac>(delegate);
-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
-      !defined(OS_CHROMEOS)
+#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11)
   return base::MakeUnique<InputMethodAuraLinux>(delegate);
 #elif defined(OS_ANDROID)
   return base::MakeUnique<InputMethodAndroid>(delegate);
diff --git a/chromium/ui/base/ime/input_method_mac.mm b/chromium/ui/base/ime/input_method_mac.mm
index b03b1620e3f..e53f0674447 100644
--- a/chromium/ui/base/ime/input_method_mac.mm
+++ b/chromium/ui/base/ime/input_method_mac.mm
@@ -4,6 +4,8 @@
 
 #include "ui/base/ime/input_method_mac.h"
 
+#import <Cocoa/Cocoa.h>
+
 namespace ui {
 
 InputMethodMac::InputMethodMac(internal::InputMethodDelegate* delegate) {
@@ -27,6 +29,10 @@ void InputMethodMac::OnCaretBoundsChanged(const TextInputClient* client) {
 }
 
 void InputMethodMac::CancelComposition(const TextInputClient* client) {
+  if (!IsTextInputClientFocused(client))
+    return;
+
+  [[NSTextInputContext currentInputContext] discardMarkedText];
 }
 
 bool InputMethodMac::IsCandidatePopupOpen() const {
diff --git a/chromium/ui/base/ime/mock_input_method.cc b/chromium/ui/base/ime/mock_input_method.cc
index fbd8bcf8b3f..d097005b5f9 100644
--- a/chromium/ui/base/ime/mock_input_method.cc
+++ b/chromium/ui/base/ime/mock_input_method.cc
@@ -14,8 +14,8 @@ MockInputMethod::MockInputMethod(internal::InputMethodDelegate* delegate)
 }
 
 MockInputMethod::~MockInputMethod() {
-  FOR_EACH_OBSERVER(InputMethodObserver, observer_list_,
-                    OnInputMethodDestroyed(this));
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnInputMethodDestroyed(this);
 }
 
 void MockInputMethod::SetDelegate(internal::InputMethodDelegate* delegate) {
@@ -45,11 +45,13 @@ void MockInputMethod::DispatchKeyEvent(ui::KeyEvent* event) {
 }
 
 void MockInputMethod::OnFocus() {
-  FOR_EACH_OBSERVER(InputMethodObserver, observer_list_, OnFocus());
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnFocus();
 }
 
 void MockInputMethod::OnBlur() {
-  FOR_EACH_OBSERVER(InputMethodObserver, observer_list_, OnBlur());
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnBlur();
 }
 
 bool MockInputMethod::OnUntranslatedIMEMessage(const base::NativeEvent& event,
@@ -60,18 +62,15 @@ bool MockInputMethod::OnUntranslatedIMEMessage(const base::NativeEvent& event,
 }
 
 void MockInputMethod::OnTextInputTypeChanged(const TextInputClient* client) {
-  FOR_EACH_OBSERVER(InputMethodObserver,
-                    observer_list_,
-                    OnTextInputTypeChanged(client));
-  FOR_EACH_OBSERVER(InputMethodObserver,
-                    observer_list_,
-                    OnTextInputStateChanged(client));
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnTextInputTypeChanged(client);
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnTextInputStateChanged(client);
 }
 
 void MockInputMethod::OnCaretBoundsChanged(const TextInputClient* client) {
-  FOR_EACH_OBSERVER(InputMethodObserver,
-                    observer_list_,
-                    OnCaretBoundsChanged(client));
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnCaretBoundsChanged(client);
 }
 
 void MockInputMethod::CancelComposition(const TextInputClient* client) {
@@ -105,7 +104,8 @@ bool MockInputMethod::IsCandidatePopupOpen() const {
 }
 
 void MockInputMethod::ShowImeIfNeeded() {
-  FOR_EACH_OBSERVER(InputMethodObserver, observer_list_, OnShowImeIfNeeded());
+  for (InputMethodObserver& observer : observer_list_)
+    observer.OnShowImeIfNeeded();
 }
 
 void MockInputMethod::AddObserver(InputMethodObserver* observer) {
diff --git a/chromium/ui/base/ime/text_input_flags.h b/chromium/ui/base/ime/text_input_flags.h
index 17fb9fb4df1..f2d7c49ec9d 100644
--- a/chromium/ui/base/ime/text_input_flags.h
+++ b/chromium/ui/base/ime/text_input_flags.h
@@ -8,7 +8,7 @@
 namespace ui {
 
 // Intentionally keep in sync with blink::WebTextInputFlags defined in:
-// third_party/WebKit/public/web/WebTextInputType.h
+// third_party/WebKit/public/platform/WebTextInputType.h
 enum TextInputFlags {
   TEXT_INPUT_FLAG_NONE = 0,
   TEXT_INPUT_FLAG_AUTOCOMPLETE_ON = 1 << 0,
diff --git a/chromium/ui/base/ime/text_input_mode.h b/chromium/ui/base/ime/text_input_mode.h
index 1344f6108c4..bf624d37476 100644
--- a/chromium/ui/base/ime/text_input_mode.h
+++ b/chromium/ui/base/ime/text_input_mode.h
@@ -17,6 +17,7 @@ enum TextInputMode {
   TEXT_INPUT_MODE_LATIN_PROSE,
   TEXT_INPUT_MODE_FULL_WIDTH_LATIN,
   TEXT_INPUT_MODE_KANA,
+  TEXT_INPUT_MODE_KANA_NAME,
   TEXT_INPUT_MODE_KATAKANA,
   TEXT_INPUT_MODE_NUMERIC,
   TEXT_INPUT_MODE_TEL,
diff --git a/chromium/ui/base/ime/text_input_type.h b/chromium/ui/base/ime/text_input_type.h
index 794f5c84182..641cb7ec8e0 100644
--- a/chromium/ui/base/ime/text_input_type.h
+++ b/chromium/ui/base/ime/text_input_type.h
@@ -8,7 +8,7 @@
 namespace ui {
 
 // Intentionally keep sync with blink::WebTextInputType defined in:
-// third_party/WebKit/public/web/WebTextInputType.h
+// third_party/WebKit/public/platform/WebTextInputType.h
 //
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.ui.base.ime