diff options
author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 07:35:15 +0000 |
---|---|---|
committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 07:35:15 +0000 |
commit | 9f064462db5b4a434d5897d524640797c55fb1b1 (patch) | |
tree | 3d3901cc25f2b1b73a5b018079a96e9113fda5ab /content/renderer/mouse_lock_dispatcher.cc | |
parent | a596e11f92a756e946ee1c4c64e9d9c083d13a2a (diff) | |
download | chromium_src-9f064462db5b4a434d5897d524640797c55fb1b1.zip chromium_src-9f064462db5b4a434d5897d524640797c55fb1b1.tar.gz chromium_src-9f064462db5b4a434d5897d524640797c55fb1b1.tar.bz2 |
Revert 119206 - Mouse Lock is currently supported in Pepper, but not yet supported from WebKit.
Move the render thread logic for managing the mouse lock state out of the pepper_plugin_delegate_impl, and into a higher level dispatcher for render_view_impl.
Handle mouse lock / pointer lock requests from both pepper and webkit (WebKit API not yet landed, small TODOs left in this code to enable once that lands).
BUG=109957
TEST=Pepper examples/mouse_lock and NaCl mouse lock examples still work.
Review URL: http://codereview.chromium.org/8970016
TBR=scheib@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9293001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/mouse_lock_dispatcher.cc')
-rw-r--r-- | content/renderer/mouse_lock_dispatcher.cc | 117 |
1 files changed, 0 insertions, 117 deletions
diff --git a/content/renderer/mouse_lock_dispatcher.cc b/content/renderer/mouse_lock_dispatcher.cc deleted file mode 100644 index 41ed654..0000000 --- a/content/renderer/mouse_lock_dispatcher.cc +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#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/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() { -} - -bool MouseLockDispatcher::LockMouse(LockTarget* target) { - if (MouseLockedOrPendingAction()) - return false; - - pending_lock_request_ = true; - target_ = target; - - Send(new ViewHostMsg_LockMouse(routing_id())); - return true; -} - -void MouseLockDispatcher::UnlockMouse(LockTarget* target) { - if (target && target == target_ && !pending_unlock_request_) { - pending_unlock_request_ = true; - Send(new ViewHostMsg_UnlockMouse(routing_id())); - } -} - -void MouseLockDispatcher::OnLockTargetDestroyed(LockTarget* target) { - if (target == target_) { - UnlockMouse(target); - target_ = NULL; - } -} - -bool MouseLockDispatcher::IsMouseLockedTo(LockTarget* target) { - return mouse_locked_ && target_ == target; -} - -bool MouseLockDispatcher::WillHandleMouseEvent( - const WebKit::WebMouseEvent& event) { - if (mouse_locked_ && target_) - return target_->HandleMouseLockedInputEvent(event); - 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_); - - mouse_locked_ = succeeded; - pending_lock_request_ = false; - if (pending_unlock_request_ && !succeeded) { - // We have sent an unlock request after the lock request. However, since - // the lock request has failed, the unlock request will be ignored by the - // browser side and there won't be any response to it. - pending_unlock_request_ = false; - } - - LockTarget* last_target = target_; - if (!succeeded) - target_ = NULL; - - // Callbacks made after all state modification to prevent reentrant errors - // such as OnLockMouseACK() synchronously calling LockMouse(). - - 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() { - DCHECK(mouse_locked_ && !pending_lock_request_); - - mouse_locked_ = false; - pending_unlock_request_ = false; - - LockTarget* last_target = target_; - target_ = NULL; - - // Callbacks made after all state modification to prevent reentrant errors - // such as OnMouseLockLost() synchronously calling LockMouse(). - - if (last_target) - last_target->OnMouseLockLost(); -} - |