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

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

Issue 10458008: Support mouse lock in Flash fullscreen mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 2ffb0941f4904d76418a629972dd878487e18442..f4ce9e19d768e25a25f15109fa17d6c65be48c65 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -233,6 +233,8 @@ void RenderWidgetHostImpl::Init() {
}
void RenderWidgetHostImpl::Shutdown() {
+ RejectMouseLockOrUnlockIfNecessary();
+
if (process_->HasConnection()) {
// Tell the renderer object to close.
bool rv = Send(new ViewMsg_Close(routing_id_));
@@ -1485,7 +1487,7 @@ void RenderWidgetHostImpl::OnMsgDidActivateAcceleratedCompositing(
view_->OnAcceleratedCompositingStateChange();
}
-void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture) {
+void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture, bool privileged) {
if (pending_mouse_lock_request_) {
Send(new ViewMsg_LockMouse_ACK(routing_id_, false));
return;
@@ -1495,7 +1497,12 @@ void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture) {
}
pending_mouse_lock_request_ = true;
- RequestToLockMouse(user_gesture);
+ if (privileged) {
brettw 2012/05/29 20:20:09 Are there security considerations here? I'm not su
+ // Directly approve to lock the mouse.
+ GotResponseToLockMouseRequest(true);
+ } else {
+ RequestToLockMouse(user_gesture);
+ }
}
void RenderWidgetHostImpl::OnMsgUnlockMouse() {

Powered by Google App Engine
This is Rietveld 408576698