[reland, refactor] - Move textInputInfo() and textInputType() from WebWidget to WebInputMethodContr…

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c424e70f7b106477e6c5b59c00aa17763921813e..fd09dd8d9e28855d270c1025432291ad613923ec 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -189,6 +189,7 @@
 #include "third_party/WebKit/public/web/WebFrameSerializer.h"
 #include "third_party/WebKit/public/web/WebFrameSerializerCacheControlPolicy.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
+#include "third_party/WebKit/public/web/WebInputMethodController.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
@@ -2290,8 +2291,10 @@ void RenderFrameImpl::OnFocusedFormFieldDataRequest(int request_id) {
   WebElement element = frame_->document().focusedElement();
 
   DCHECK(GetRenderWidget()->GetWebWidget());
+  blink::WebInputMethodController* controller =
+      frame_->frameWidget()->getActiveWebInputMethodController();
   blink::WebTextInputInfo info =
-      GetRenderWidget()->GetWebWidget()->textInputInfo();
+      controller ? controller->textInputInfo() : blink::WebTextInputInfo();
   FormFieldData field;
   field.text = info.value.utf8();
   field.placeholder = element.getAttribute("placeholder").utf8();
@@ -6040,7 +6043,7 @@ void RenderFrameImpl::SyncSelectionIfRequired() {
 
     range = gfx::Range(selection.startOffset(), selection.endOffset());
 
-    if (GetRenderWidget()->GetWebWidget()->textInputType() !=
+    if (frame_->inputMethodController()->textInputType() !=
         blink::WebTextInputTypeNone) {
       // If current focused element is editable, we will send 100 more chars
       // before and after selection. It is for input method surrounding text