refactoring mouse lock to support pepper and WebKit

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index cffbbbab0d89449a088db9e5b98b2602a973acee..fcc9b1f0f5256fc27816e8294c6325e3e4d17c52 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -62,6 +62,7 @@
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/render_media_log.h"
 #include "content/renderer/mhtml_generator.h"
+#include "content/renderer/mouse_lock_dispatcher.h"
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
@@ -361,6 +362,7 @@ RenderViewImpl::RenderViewImpl(
       p2p_socket_dispatcher_(NULL),
       devtools_agent_(NULL),
       renderer_accessibility_(NULL),
+      mouse_lock_dispatcher_(NULL),
       session_storage_namespace_id_(session_storage_namespace_id),
       handling_select_range_(false),
 #if defined(OS_WIN)
@@ -430,6 +432,7 @@ RenderViewImpl::RenderViewImpl(
   devtools_agent_ = new DevToolsAgent(this);
 
   renderer_accessibility_ = new RendererAccessibility(this);
+  mouse_lock_dispatcher_ = new MouseLockDispatcher(this);

[yzshen1, 2012/01/12 19:49:25]

- This is not 'lazily initialized' as the comment in the .h file says, right?
- Currently the object is leaked. You probably want to use scoped_ptr.
- It seems you haven't included the dispatcher implementation in the CL.

[scheib, 2012/01/12 21:25:19]

Fixed comment; cut paste error.

The object is a RenderViewObserver, which will self delete when the RenderView
is destroyed.

Added missing files.

 
   new IdleUserDetector(this);
 
@@ -583,6 +586,20 @@ bool RenderViewImpl::GetPluginInfo(const GURL& url,
   return found;
 }
 
+bool RenderViewImpl::PpapiLockMouse(webkit::ppapi::PluginInstance* pinstance) {
+  return mouse_lock_dispatcher_->LockMouse(NULL, pinstance);
+}
+
+void RenderViewImpl::PpapiUnlockMouse(
+    webkit::ppapi::PluginInstance* pinstance) {
+  mouse_lock_dispatcher_->UnlockMouse(NULL, pinstance);
+}
+
+bool RenderViewImpl::PpapiIsMouseLockedTo(
+    webkit::ppapi::PluginInstance* pinstance) {
+  return mouse_lock_dispatcher_->IsMouseLockedTo(pinstance);
+}
+
 bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
   WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL;
   if (main_frame)
@@ -695,8 +712,6 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewMsg_SetHistoryLengthAndPrune,
                         OnSetHistoryLengthAndPrune)
     IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode)
-    IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK)
-    IPC_MESSAGE_HANDLER(ViewMsg_MouseLockLost, OnMouseLockLost)
     IPC_MESSAGE_HANDLER(JavaBridgeMsg_Init, OnJavaBridgeInit)
 
     // Have the super handle all other messages.
@@ -1873,6 +1888,18 @@ void RenderViewImpl::exitFullScreen() {
   Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false));
 }
 
+bool RenderViewImpl::pointerLock(WebKit::WebWidget* webwidget) {
+  return mouse_lock_dispatcher_->LockMouse(webwidget, NULL);
+}
+
+void RenderViewImpl::pointerUnlock(WebKit::WebWidget* webwidget) {
+  mouse_lock_dispatcher_->UnlockMouse(webwidget, NULL);
+}
+
+bool RenderViewImpl::isPointerLockedTo(WebKit::WebWidget* webwidget) {
+  return mouse_lock_dispatcher_->IsPointerLockedTo(webwidget);
+}
+
 // WebKit::WebFrameClient -----------------------------------------------------
 
 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
@@ -4307,7 +4334,11 @@ void RenderViewImpl::DidHandleKeyEvent() {
 }
 
 bool RenderViewImpl::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
-  return pepper_delegate_.HandleMouseEvent(event);
+  pepper_delegate_.WillHandleMouseEvent();
+
+  // If the mouse is locked, only the current owner of the mouse lock can
+  // process mouse events.
+  return mouse_lock_dispatcher_->WillHandleMouseEvent(event);
 }
 
 void RenderViewImpl::DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {
@@ -4801,23 +4832,6 @@ void RenderViewImpl::OnEnableViewSourceMode() {
   main_frame->enableViewSourceMode(true);
 }
 
-void RenderViewImpl::OnLockMouseACK(bool 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)
-    OnMouseCaptureLost();
-
-  pepper_delegate_.OnLockMouseACK(succeeded);
-}
-
-void RenderViewImpl::OnMouseLockLost() {
-  pepper_delegate_.OnMouseLockLost();
-}
-
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }