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

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 730243d4a00443a9ed5118dd2e46261e45c5a3f3..82c718df7cf0caa4f4ddf4699078cb30b2084225 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -337,6 +337,12 @@ WebInputEventResult WebFrameWidgetImpl::handleInputEvent(
   AutoReset<const WebInputEvent*> currentEventChange(&m_currentInputEvent,
                                                      &inputEvent);
 
+  if (m_client && m_client->isPointerLocked() &&

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

Why would the client be null here?

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

It shouldn't be. I just copied the code from WebViewImpl, but the way
WebFrameWidgetImpl is setup we shouldn't have a null client.

+      WebInputEvent::isMouseEventType(inputEvent.type())) {
+    pointerLockMouseEvent(inputEvent);
+    return WebInputEventResult::HandledSystem;
+  }
+
   if (m_mouseCaptureNode &&
       WebInputEvent::isMouseEventType(inputEvent.type())) {
     TRACE_EVENT1("input", "captured mouse event", "type", inputEvent.type());
@@ -667,18 +673,6 @@ void WebFrameWidgetImpl::willCloseLayerTreeView() {
   m_layerTreeViewClosed = true;
 }
 
-void WebFrameWidgetImpl::didAcquirePointerLock() {
-  page()->pointerLockController().didAcquirePointerLock();
-}
-
-void WebFrameWidgetImpl::didNotAcquirePointerLock() {
-  page()->pointerLockController().didNotAcquirePointerLock();
-}
-
-void WebFrameWidgetImpl::didLosePointerLock() {
-  page()->pointerLockController().didLosePointerLock();
-}
-
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::getCompositionCharacterBounds(