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

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 171 matching lines @@
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
 #include "third_party/WebKit/public/web/WebColorSuggestion.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
 #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"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebPluginDocument.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebRange.h"
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
@@ skipping 2081 matching lines @@
   if (frame_ != render_view_->GetWebView()->focusedFrame() ||
       frame_->document().focusedElement().isNull()) {
     Send(new FrameHostMsg_FocusedFormFieldDataResponse(routing_id_, request_id,
                                                        FormFieldData()));
     return;
   }
 
   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();
   field.text_input_type = GetRenderWidget()->GetTextInputType();
 
   Send(new FrameHostMsg_FocusedFormFieldDataResponse(routing_id_, request_id,
                                                      field));
 }
 
 bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type,
@@ skipping 3728 matching lines @@
   } else
 #endif
   {
     WebRange selection =
         GetRenderWidget()->GetWebWidget()->caretOrSelectionRange();
     if (selection.isNull())
       return;
 
     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
       // feature.
       if (selection.startOffset() > kExtraCharsBeforeAndAfterSelection)
         offset = selection.startOffset() - kExtraCharsBeforeAndAfterSelection;
       else
         offset = 0;
       size_t length =
           selection.endOffset() - offset + kExtraCharsBeforeAndAfterSelection;
@@ skipping 707 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content