| 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..160d42e552c893fd3c9f753bbabf0d47919f95d7 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) {}
|
|
|
| @@ -267,6 +269,14 @@ void RenderWidgetHostViewBase::FlushInput() {
|
| impl->FlushInput();
|
| }
|
|
|
| +void RenderWidgetHostViewBase::OnTextInputManagerDestroyed(
|
| + TextInputManager* text_input_manager) {
|
| + DCHECK(text_input_manager_ == text_input_manager);
|
| +
|
| + text_input_manager_->Unregister(this);
|
| + text_input_manager_ = nullptr;
|
| +}
|
| +
|
| void RenderWidgetHostViewBase::OnTextSurroundingSelectionResponse(
|
| const base::string16& content,
|
| size_t start_offset,
|
| @@ -382,6 +392,27 @@ 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())
|
| + 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);
|
|
|