Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1948343002: [reland] Browser Side Text Input State Tracking for OOPIF (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 56738c74d37f7ba1c7cd4b8560fbbc86c3c13173..7124b200ca716c72feb98ae1eab793b1cc56cb89 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"
@@ -2364,6 +2365,25 @@ void WebContentsImpl::SendScreenRects() {
browser_plugin_embedder_->DidSendScreenRects();
}
+TextInputManager* WebContentsImpl::GetTextInputManager() {
+ if (GetOuterWebContents()) {
+ if (text_input_manager_) {
+ // Since the outer WebContents exists, we should destroy
+ // |text_input_manager_| which will in turn notify all the
+ // RenderWidgetHostViews.
+ // TODO(ekaramad): Is this the right way to for IME handoff?
kenrb 2016/05/12 16:16:37 I have concerns about this, there were problems wi
EhsanK 2016/05/13 16:00:56 Indeed, the case with <webview> is very tricky. As
+ // (crbug.com/609846).
+ text_input_manager_.reset(nullptr);
+ }
+ return GetOuterWebContents()->GetTextInputManager();
+ }
+
+ if (!text_input_manager_)
+ text_input_manager_.reset(new TextInputManager());
+
+ return text_input_manager_.get();
+}
+
BrowserAccessibilityManager*
WebContentsImpl::GetRootBrowserAccessibilityManager() {
RenderFrameHostImpl* rfh = GetMainFrame();

Powered by Google App Engine
This is Rietveld 408576698