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

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: send privileged request through webcontents 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 8c8bae4d2a923c28f62218a6a14ad6ca02fd40e5..95265a10c5e8eb18d344fea4409db56dfcdfa995 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1733,16 +1733,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);
}
}

Powered by Google App Engine
This is Rietveld 408576698