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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2112923002: Fix crash when destroying a RenderWidgetHost that holds the pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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
Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index becd856cac60346925e4dcf3b25a23a8692286e3..b0c562edea6c5a15e42d94614f9d5b97913dff9e 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1731,16 +1731,17 @@ void RenderWidgetHostImpl::OnLockMouse(bool user_gesture,
}
pending_mouse_lock_request_ = true;
+ if (delegate_) {
+ delegate_->RequestToLockMouse(this, user_gesture, last_unlocked_by_target,
+ privileged && allow_privileged_mouse_lock_);
+ return;
+ }
+
if (privileged && allow_privileged_mouse_lock_) {
// Directly approve to lock the mouse.
GotResponseToLockMouseRequest(true);
} else {
- if (delegate_) {
- delegate_->RequestToLockMouse(this, user_gesture,
- last_unlocked_by_target);
- return;
- }
- // If there's no delegate, just reject it.
+ // Otherwise, just reject it.
GotResponseToLockMouseRequest(false);
}
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_delegate.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698