Index: content/browser/frame_host/render_widget_host_view_guest.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc |
index b3b8d6828e36dbd318760ba6fadbbc1c084ea0a2..ab367971596dac4c04e4f247644f13cf8a12c974 100644 |
--- a/content/browser/frame_host/render_widget_host_view_guest.cc |
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc |
@@ -24,6 +24,7 @@ |
#include "content/common/frame_messages.h" |
#include "content/common/gpu/gpu_messages.h" |
#include "content/common/input/web_touch_event_traits.h" |
+#include "content/common/site_isolation_policy.h" |
#include "content/common/view_messages.h" |
#include "content/common/webplugin_geometry.h" |
#include "content/public/common/content_switches.h" |
@@ -365,7 +366,7 @@ void RenderWidgetHostViewGuest::MovePluginWindows( |
} |
void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) { |
- // InterstitialPages are not WebContents so we cannot intercept |
+ // InterstitialPages are not WebContents so we cannot interceptG |
kenrb
2016/02/01 20:12:43
nit: typo
EhsanK
2016/02/12 15:46:59
Done.
|
// ViewHostMsg_SetCursor for interstitial pages in BrowserPluginGuest. |
// All guest RenderViewHosts have RenderWidgetHostViewGuests however, |
// and so we will always hit this code path. |
@@ -381,16 +382,15 @@ void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) { |
platform_view_->SetIsLoading(is_loading); |
} |
-void RenderWidgetHostViewGuest::TextInputStateChanged( |
- const ViewHostMsg_TextInputState_Params& params) { |
+void RenderWidgetHostViewGuest::NotifyTextInputStateChanged() { |
if (!guest_) |
return; |
+ RenderWidgetHostViewBase::NotifyTextInputStateChanged(); |
+ |
RenderWidgetHostViewBase* rwhv = GetOwnerRenderWidgetHostView(); |
- if (!rwhv) |
- return; |
- // Forward the information to embedding RWHV. |
- rwhv->TextInputStateChanged(params); |
+ // Notify the embedder of a change in text input state. |
+ rwhv->NotifyGuestTextInputStateChanged(this); |
} |
void RenderWidgetHostViewGuest::ImeCancelComposition() { |