Move call path for resetInputMethod

third_party/WebKit/Source/core/page/FocusController.cpp

Index: third_party/WebKit/Source/core/page/FocusController.cpp
diff --git a/third_party/WebKit/Source/core/page/FocusController.cpp b/third_party/WebKit/Source/core/page/FocusController.cpp
index 89be696b17f9347030c1c3633e9cb95b47477fbe..4e0e692bbf2043b5cf95c314eee6cc2acf350ef2 100644
--- a/third_party/WebKit/Source/core/page/FocusController.cpp
+++ b/third_party/WebKit/Source/core/page/FocusController.cpp
@@ -39,6 +39,7 @@
 #include "core/editing/EditingUtilities.h"  // For firstPositionInOrBeforeNode
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
+#include "core/editing/InputMethodController.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameClient.h"
 #include "core/frame/FrameView.h"
@@ -1128,7 +1129,8 @@ bool FocusController::setFocusedElement(Element* element,
       !relinquishesEditingFocus(*oldFocusedElement))
     return false;
 
-  m_page->chromeClient().willSetInputMethodState();
+  if (oldFocusedFrame)
+    oldFocusedFrame->inputMethodController().willChangeFocus();
 
   Document* newDocument = nullptr;
   if (element)