Chromium Code Reviews| 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 9cdceb518eefad1e7dd47f841d32010a917e8044..77b42c95fcc7e9c6cbf332c6a98f37a3fd01fddb 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_base.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_base.cc |
| @@ -10,11 +10,18 @@ |
| #include "content/browser/gpu/gpu_data_manager_impl.h" |
| #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" |
| #include "content/browser/renderer_host/render_process_host_impl.h" |
| +#include "content/browser/renderer_host/render_view_host_delegate.h" |
| +#include "content/browser/renderer_host/render_view_host_impl.h" |
| #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/common/content_switches_internal.h" |
| +#include "content/common/input_messages.h" |
| +#include "content/common/site_isolation_policy.h" |
| +#include "content/common/text_input_state.h" |
| +#include "content/common/view_messages.h" |
| #include "content/public/browser/render_widget_host_view_frame_subscriber.h" |
| +#include "content/public/common/browser_plugin_guest_mode.h" |
| #include "ui/gfx/display.h" |
| #include "ui/gfx/geometry/point_conversions.h" |
| #include "ui/gfx/geometry/size_conversions.h" |
| @@ -379,6 +386,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase() |
| current_display_rotation_(gfx::Display::ROTATE_0), |
| pinch_zoom_enabled_(content::IsPinchToZoomEnabled()), |
| renderer_frame_number_(0), |
| + text_input_state_(new TextInputState), |
|
Charlie Reis
2016/03/15 18:32:00
Minor nit: new TextInputState()
EhsanK
2016/03/15 23:51:17
Done.
|
| weak_factory_(this) {} |
| RenderWidgetHostViewBase::~RenderWidgetHostViewBase() { |
| @@ -720,6 +728,37 @@ void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace( |
| *transformed_point = point; |
| } |
| +void RenderWidgetHostViewBase::TextInputStateChanged( |
| + const TextInputState& params) { |
| + bool text_input_state_changed = true; |
| +#if !defined(OS_ANDROID) |
| + if (params.type == text_input_state_->type && |
| + params.can_compose_inline == text_input_state_->can_compose_inline |
| +#if !defined(OS_MACOSX) |
| + && params.mode == text_input_state_->mode && |
| + params.flags == text_input_state_->flags |
| +#endif |
| + ) |
| + text_input_state_changed = false; |
| +#else |
| + if (params.is_non_ime_change) { |
| + // Sends an acknowledgement to the renderer of a processed IME event. |
| + GetRenderWidgetHost()->Send( |
| + new InputMsg_ImeEventAck(GetRenderWidgetHost()->GetRoutingID())); |
| + } |
| +#endif |
| + |
| + if (text_input_state_changed) { |
| + *text_input_state_ = params; |
| + RenderWidgetHostImpl::From(GetRenderWidgetHost()) |
| + ->delegate() |
| + ->UpdateTextInputState(this, text_input_state_changed); |
| + } |
| +} |
| + |
| +void RenderWidgetHostViewBase::UpdateInputMethodIfNecessary( |
| + bool text_input_state_changed) {} |
|
Charlie Reis
2016/03/15 18:32:00
nit: You don't need this in the .cc file if it's e
EhsanK
2016/03/15 23:51:17
Done.
|
| + |
| void RenderWidgetHostViewBase::AddObserver( |
| RenderWidgetHostViewBaseObserver* observer) { |
| observers_.AddObserver(observer); |