| 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..4dfecbf6432a051a86f21bbf9412d14ad23fb233 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -1040,7 +1040,9 @@ gfx::Rect RenderWidgetHostImpl::GetRootWindowResizerRect() const {
|
| return gfx::Rect();
|
| }
|
|
|
| -void RenderWidgetHostImpl::RequestToLockMouse(bool /* user_gesture */) {
|
| +void RenderWidgetHostImpl::RequestToLockMouse(
|
| + MouseLockSource /* lock_source */,
|
| + MouseUnlockSource /* previous_unlock_source */) {
|
| // Directly reject to lock the mouse. Subclass can override this method to
|
| // decide whether to allow mouse lock or not.
|
| GotResponseToLockMouseRequest(false);
|
| @@ -1485,7 +1487,10 @@ void RenderWidgetHostImpl::OnMsgDidActivateAcceleratedCompositing(
|
| view_->OnAcceleratedCompositingStateChange();
|
| }
|
|
|
| -void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture) {
|
| +void RenderWidgetHostImpl::OnMsgLockMouse(
|
| + MouseLockSource lock_source,
|
| + MouseUnlockSource previous_unlock_source) {
|
| +
|
| if (pending_mouse_lock_request_) {
|
| Send(new ViewMsg_LockMouse_ACK(routing_id_, false));
|
| return;
|
| @@ -1495,7 +1500,7 @@ void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture) {
|
| }
|
|
|
| pending_mouse_lock_request_ = true;
|
| - RequestToLockMouse(user_gesture);
|
| + RequestToLockMouse(lock_source, previous_unlock_source);
|
| }
|
|
|
| void RenderWidgetHostImpl::OnMsgUnlockMouse() {
|
|
|