Unify the code paths for handling mouse events when pointer is locked on

third_party/WebKit/Source/web/WebViewImpl.cpp

Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 598a7cd95fdc1fad932260e3682c3a41a666aa2a..6dc0e376cb0b3cb7a50f9a0b7437f727cf424722 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2170,7 +2170,7 @@ WebInputEventResult WebViewImpl::handleInputEvent(
   }
 
   if (isPointerLocked && WebInputEvent::isMouseEventType(inputEvent.type())) {
-    pointerLockMouseEvent(inputEvent);
+    mainFrameImpl()->frameWidget()->pointerLockMouseEvent(inputEvent);
     return WebInputEventResult::HandledSystem;
   }
 
@@ -2523,19 +2523,15 @@ void WebViewImpl::willCloseLayerTreeView() {
 }
 
 void WebViewImpl::didAcquirePointerLock() {
-  if (page())
-    page()->pointerLockController().didAcquirePointerLock();
+  mainFrameImpl()->frameWidget()->didAcquirePointerLock();
 }
 
 void WebViewImpl::didNotAcquirePointerLock() {
-  if (page())
-    page()->pointerLockController().didNotAcquirePointerLock();
+  mainFrameImpl()->frameWidget()->didNotAcquirePointerLock();
 }
 
 void WebViewImpl::didLosePointerLock() {
-  m_pointerLockGestureToken.clear();
-  if (page())
-    page()->pointerLockController().didLosePointerLock();
+  mainFrameImpl()->frameWidget()->didLosePointerLock();

[dcheng, 2017/02/13 23:21:28]

Can we remove these from being exposed via WebView altogether?

[lfg, 2017/02/14 15:42:49]

Not until more work is done; in particular, the RenderWidget calls these
functions, and the WebWidget that's associated with the RenderWidget is still a
WebViewImpl, instead of a WebFrameWidget.

[dcheng, 2017/02/14 19:20:28]

Is this something the content side patches that you mentioned earlier today
would do?

[lfg, 2017/02/14 19:29:03]

No, unfortunately not. This is due to the design of
content::MouseLockDispatcher, which gets created in RenderWidget::Init, before
the WebViewFrameWidget is created, so it can only be associated with the
WebViewImpl at that point. To remove those from being exposed in WebView, we
would either have to redesign the lifetime of the mouse lock objects, or
associate the RenderWidget with the WebViewFrameWidget (I tried to do that in
the past, and there was a lot of other lifetime issues related closing the
WebViewFrameWidget and the WebViewImpl).

See https://cs.chromium.org/chromium/src/content/renderer/render_widget.cc?l=539

[dcheng, 2017/02/14 23:46:10]

I assume we have a long-term bug for cleaning this up. If not, do you mind
filing one?

 }
 
 // TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
@@ -4085,42 +4081,6 @@ void WebViewImpl::setCompositorVisibility(bool isVisible) {
     m_layerTreeView->setVisible(isVisible);
 }
 
-void WebViewImpl::pointerLockMouseEvent(const WebInputEvent& event) {
-  std::unique_ptr<UserGestureIndicator> gestureIndicator;
-  AtomicString eventType;
-  switch (event.type()) {
-    case WebInputEvent::MouseDown:
-      eventType = EventTypeNames::mousedown;
-      if (!page() || !page()->pointerLockController().element())
-        break;
-      gestureIndicator = WTF::wrapUnique(
-          new UserGestureIndicator(DocumentUserGestureToken::create(
-              &page()->pointerLockController().element()->document(),
-              UserGestureToken::NewGesture)));
-      m_pointerLockGestureToken = gestureIndicator->currentToken();
-      break;
-    case WebInputEvent::MouseUp:
-      eventType = EventTypeNames::mouseup;
-      gestureIndicator = WTF::wrapUnique(
-          new UserGestureIndicator(m_pointerLockGestureToken.release()));
-      break;
-    case WebInputEvent::MouseMove:
-      eventType = EventTypeNames::mousemove;
-      break;
-    default:
-      NOTREACHED();
-  }
-
-  const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event);
-
-  if (page()) {
-    WebMouseEvent transformedEvent =
-        TransformWebMouseEvent(mainFrameImpl()->frameView(), mouseEvent);
-    page()->pointerLockController().dispatchLockedMouseEvent(transformedEvent,
-                                                             eventType);
-  }
-}
-
 void WebViewImpl::forceNextWebGLContextCreationToFail() {
   WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }