| 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..171d61eb77c43e47802b9a1de51baccaed46fff9 100644
|
| --- a/content/renderer/mouse_lock_dispatcher.cc
|
| +++ b/content/renderer/mouse_lock_dispatcher.cc
|
| @@ -4,19 +4,13 @@
|
|
|
| #include "content/renderer/mouse_lock_dispatcher.h"
|
|
|
| -#include "content/common/view_messages.h"
|
| -#include "content/renderer/render_view_impl.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
|
| +#include "base/logging.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
|
| -
|
| -MouseLockDispatcher::MouseLockDispatcher(RenderViewImpl* render_view_impl)
|
| - : content::RenderViewObserver(render_view_impl),
|
| - render_view_impl_(render_view_impl),
|
| - mouse_locked_(false),
|
| - pending_lock_request_(false),
|
| - pending_unlock_request_(false),
|
| - target_(NULL) {
|
| +
|
| +MouseLockDispatcher::MouseLockDispatcher() : mouse_locked_(false),
|
| + pending_lock_request_(false),
|
| + pending_unlock_request_(false),
|
| + target_(NULL) {
|
| }
|
|
|
| MouseLockDispatcher::~MouseLockDispatcher() {
|
| @@ -29,19 +23,14 @@ bool MouseLockDispatcher::LockMouse(LockTarget* target) {
|
| pending_lock_request_ = true;
|
| target_ = target;
|
|
|
| - bool user_gesture =
|
| - render_view_impl_->webview() &&
|
| - render_view_impl_->webview()->mainFrame() &&
|
| - render_view_impl_->webview()->mainFrame()->isProcessingUserGesture();
|
| -
|
| - Send(new ViewHostMsg_LockMouse(routing_id(), user_gesture));
|
| + SendLockMouseRequest();
|
| return true;
|
| }
|
|
|
| void MouseLockDispatcher::UnlockMouse(LockTarget* target) {
|
| if (target && target == target_ && !pending_unlock_request_) {
|
| pending_unlock_request_ = true;
|
| - Send(new ViewHostMsg_UnlockMouse(routing_id()));
|
| + SendUnlockMouseRequest();
|
| }
|
| }
|
|
|
| @@ -63,16 +52,6 @@ bool MouseLockDispatcher::WillHandleMouseEvent(
|
| return false;
|
| }
|
|
|
| -bool MouseLockDispatcher::OnMessageReceived(const IPC::Message& message) {
|
| - bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(MouseLockDispatcher, message)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_MouseLockLost, OnMouseLockLost)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| -}
|
| -
|
| void MouseLockDispatcher::OnLockMouseACK(bool succeeded) {
|
| DCHECK(!mouse_locked_ && pending_lock_request_);
|
|
|
| @@ -94,15 +73,6 @@ void MouseLockDispatcher::OnLockMouseACK(bool succeeded) {
|
|
|
| if (last_target)
|
| last_target->OnLockMouseACK(succeeded);
|
| -
|
| - // Mouse Lock removes the system cursor and provides all mouse motion as
|
| - // .movementX/Y values on events all sent to a fixed target. This requires
|
| - // content to specifically request the mode to be entered.
|
| - // Mouse Capture is implicitly given for the duration of a drag event, and
|
| - // sends all mouse events to the initial target of the drag.
|
| - // If Lock is entered it supercedes any in progress Capture.
|
| - if (succeeded && render_view_impl_->webwidget())
|
| - render_view_impl_->webwidget()->mouseCaptureLost();
|
| }
|
|
|
| void MouseLockDispatcher::OnMouseLockLost() {
|
| @@ -120,4 +90,3 @@ void MouseLockDispatcher::OnMouseLockLost() {
|
| if (last_target)
|
| last_target->OnMouseLockLost();
|
| }
|
| -
|
|
|