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

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.cc

Issue 1845083002: Fix <webview> cursors with --site-per-process and --isolate-extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 72072577df2ea6a5a0d8c362862c5d9275be050b..5db60538a01060edbd719353c65a438a5ca3a54e 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc
@@ -23,6 +23,7 @@
#include "content/common/browser_plugin/browser_plugin_messages.h"
#include "content/common/frame_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"
@@ -334,10 +335,14 @@ void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) {
// and so we will always hit this code path.
if (!guest_)
return;
- guest_->SendMessageToEmbedder(
- new BrowserPluginMsg_SetCursor(guest_->browser_plugin_instance_id(),
- cursor));
-
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
+ RenderWidgetHostViewBase* rwhvb = GetOwnerRenderWidgetHostView();
+ if (rwhvb)
+ rwhvb->UpdateCursor(cursor);
+ } else {
+ guest_->SendMessageToEmbedder(new BrowserPluginMsg_SetCursor(
+ guest_->browser_plugin_instance_id(), cursor));
+ }
}
void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698