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

Unified Diff: content/browser/renderer_host/render_widget_host_view_base.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/renderer_host/render_widget_host_view_base.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index dd88faea8fae27b0cfc71207869e299227a5a363..016dfe1eb9a29661fef96b62a49fc05b8f55aeae 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -13,6 +13,7 @@
#include "content/browser/renderer_host/render_widget_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base_observer.h"
+#include "content/browser/renderer_host/text_input_manager.h"
#include "content/common/content_switches_internal.h"
#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
#include "ui/display/display.h"
@@ -40,6 +41,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
current_device_scale_factor_(0),
current_display_rotation_(display::Display::ROTATE_0),
pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
+ text_input_manager_(nullptr),
renderer_frame_number_(0),
weak_factory_(this) {}
@@ -382,6 +384,30 @@ void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace(
*transformed_point = point;
}
+void RenderWidgetHostViewBase::TextInputStateChanged(
+ const TextInputState& text_input_state) {
+ if (GetTextInputManager())
+ GetTextInputManager()->UpdateTextInputState(this, text_input_state);
+}
+
+TextInputManager* RenderWidgetHostViewBase::GetTextInputManager() {
+ if (text_input_manager_)
+ return text_input_manager_;
+
+ RenderWidgetHostImpl* host =
+ RenderWidgetHostImpl::From(GetRenderWidgetHost());
+ if (!host || !host->delegate())
+ return nullptr;
+
+ // This RWHV needs to be registered with the TextInputManager so that the
+ // TextInputManager starts observing its lifetime.
+ text_input_manager_ = host->delegate()->GetTextInputManager();
+ if (text_input_manager_)
+ text_input_manager_->Register(this);
+
+ return text_input_manager_;
+}
+
void RenderWidgetHostViewBase::AddObserver(
RenderWidgetHostViewBaseObserver* observer) {
observers_.AddObserver(observer);

Powered by Google App Engine
This is Rietveld 408576698