Chromium Code Reviews| Index: content/renderer/mouse_lock_dispatcher.cc |
| diff --git a/content/renderer/mouse_lock_dispatcher.cc b/content/renderer/mouse_lock_dispatcher.cc |
| index 886067cd4d6dcf47893698a3d3271b44676152ab..4fcb2cd9e550e22734cd7c06b846021fb6dc1753 100644 |
| --- a/content/renderer/mouse_lock_dispatcher.cc |
| +++ b/content/renderer/mouse_lock_dispatcher.cc |
| @@ -16,6 +16,7 @@ MouseLockDispatcher::MouseLockDispatcher(RenderViewImpl* render_view_impl) |
| mouse_locked_(false), |
| pending_lock_request_(false), |
| pending_unlock_request_(false), |
| + unlocked_by_target_(false), |
| target_(NULL) { |
| } |
| @@ -33,14 +34,17 @@ bool MouseLockDispatcher::LockMouse(LockTarget* target) { |
| render_view_impl_->webview() && |
| render_view_impl_->webview()->mainFrame() && |
| render_view_impl_->webview()->mainFrame()->isProcessingUserGesture(); |
| - |
| - Send(new ViewHostMsg_LockMouse(routing_id(), user_gesture)); |
| + Send( |
|
scheib
2012/05/30 20:10:06
Too trivial to bother modifying this file.
dmurph
2012/05/30 20:54:30
Done.
|
| + new ViewHostMsg_LockMouse(routing_id(), user_gesture, |
| + unlocked_by_target_)); |
| + unlocked_by_target_ = false; |
| return true; |
| } |
| void MouseLockDispatcher::UnlockMouse(LockTarget* target) { |
| if (target && target == target_ && !pending_unlock_request_) { |
| pending_unlock_request_ = true; |
| + unlocked_by_target_ = true; |
| Send(new ViewHostMsg_UnlockMouse(routing_id())); |
| } |
| } |
| @@ -120,4 +124,3 @@ void MouseLockDispatcher::OnMouseLockLost() { |
| if (last_target) |
| last_target->OnMouseLockLost(); |
| } |
| - |