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..f8a155488859390e828eab05fcb5b8a1bc8a5301 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,7 +386,11 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase() |
current_display_rotation_(gfx::Display::ROTATE_0), |
pinch_zoom_enabled_(content::IsPinchToZoomEnabled()), |
renderer_frame_number_(0), |
- weak_factory_(this) {} |
+ text_input_state_(new TextInputState), |
+ text_input_state_changed_(false), |
+ weak_factory_(this) { |
+ cached_text_input_state_ = text_input_state_.get(); |
+} |
RenderWidgetHostViewBase::~RenderWidgetHostViewBase() { |
DCHECK(!mouse_locked_); |
@@ -566,6 +577,14 @@ bool RenderWidgetHostViewBase::HasDisplayPropertyChanged(gfx::NativeView view) { |
return true; |
} |
+bool RenderWidgetHostViewBase::ShouldProcessTextInputState() { |
+ if (text_input_state_changed_) { |
+ text_input_state_changed_ = false; |
+ return true; |
+ } |
+ return false; |
+} |
+ |
base::WeakPtr<RenderWidgetHostViewBase> RenderWidgetHostViewBase::GetWeakPtr() { |
return weak_factory_.GetWeakPtr(); |
} |
@@ -720,6 +739,44 @@ void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace( |
*transformed_point = point; |
} |
+void RenderWidgetHostViewBase::TextInputStateChanged( |
+ const TextInputState& params) { |
+ 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; |
+ |
+ UpdateTextInputState(); |
+} |
+ |
+RenderWidgetHostViewBase* RenderWidgetHostViewBase::GetFocusedView() { |
+ if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
+ return this; |
+ RenderWidgetHostViewBase* focused_view = |
+ RenderWidgetHostImpl::From(GetRenderWidgetHost()) |
+ ->delegate() |
+ ->GetFocusedView(); |
+ return !!focused_view ? focused_view : this; |
+} |
+ |
+void RenderWidgetHostViewBase::UpdateTextInputState() {} |
+ |
void RenderWidgetHostViewBase::AddObserver( |
RenderWidgetHostViewBaseObserver* observer) { |
observers_.AddObserver(observer); |