Chromium Code Reviews| Index: content/browser/web_contents/web_contents_impl.cc |
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
| index 3362cc1b63417be749ef6832eabd73c03b175083..98262726a59ea4dded72748272fdb0066f228256 100644 |
| --- a/content/browser/web_contents/web_contents_impl.cc |
| +++ b/content/browser/web_contents/web_contents_impl.cc |
| @@ -65,6 +65,7 @@ |
| #include "content/browser/renderer_host/render_widget_host_impl.h" |
| #include "content/browser/renderer_host/render_widget_host_input_event_router.h" |
| #include "content/browser/renderer_host/render_widget_host_view_base.h" |
| +#include "content/browser/renderer_host/text_input_manager.h" |
| #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h" |
| #include "content/browser/site_instance_impl.h" |
| #include "content/browser/wake_lock/wake_lock_service_context.h" |
| @@ -1414,6 +1415,13 @@ void WebContentsImpl::AttachToOuterWebContentsFrame( |
| static_cast<RenderWidgetHostViewChildFrame*>( |
| render_manager->GetRenderWidgetHostView()) |
| ->RegisterSurfaceNamespaceId(); |
| + |
| + // At this point, we should destroy the TextInputManager which will notify all |
| + // the RWHV in this WebContents. |
|
Charlie Reis
2016/05/18 20:46:05
What is this accomplishing for the inner WebConten
EhsanK
2016/05/24 20:42:46
On line 2376, we return the outer WebContents Text
|
| + // TODO(ekaramad): Is this the right way to for IME handoff? Is it possible to |
|
Charlie Reis
2016/05/18 20:46:05
Not sure I understand this TODO. (Right way to wh
EhsanK
2016/05/24 20:42:46
Me neither yet. This only affects OOPIF-<webview>
|
| + // have TextInputState (not none) before attaching? If so, we need to restore |
| + // it (crbug.com/609846). |
| + text_input_manager_.reset(nullptr); |
| } |
| void WebContentsImpl::Stop() { |
| @@ -2364,6 +2372,16 @@ void WebContentsImpl::SendScreenRects() { |
| browser_plugin_embedder_->DidSendScreenRects(); |
| } |
| +TextInputManager* WebContentsImpl::GetTextInputManager() { |
| + if (GetOuterWebContents()) |
| + return GetOuterWebContents()->GetTextInputManager(); |
| + |
| + if (!text_input_manager_) |
| + text_input_manager_.reset(new TextInputManager()); |
| + |
| + return text_input_manager_.get(); |
| +} |
| + |
| BrowserAccessibilityManager* |
| WebContentsImpl::GetRootBrowserAccessibilityManager() { |
| RenderFrameHostImpl* rfh = GetMainFrame(); |