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

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 319 matching lines @@
   // Report the event to be NOT processed by WebKit, so that the browser can
   // handle it appropriately.
   if (ignoreInputEvents())
     return WebInputEventResult::NotHandled;
 
   // FIXME: pass event to m_localRoot's WebDevToolsAgentImpl once available.
 
   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());
     // Save m_mouseCaptureNode since mouseCaptureLost() will clear it.
     Node* node = m_mouseCaptureNode;
 
     // Not all platforms call mouseCaptureLost() directly.
     if (inputEvent.type() == WebInputEvent::MouseUp)
       mouseCaptureLost();
 
@@ skipping 310 matching lines @@
                                    m_localRoot->frame()->view());
   }
 
   setIsAcceleratedCompositingActive(false);
   m_mutator = nullptr;
   m_layerTreeView = nullptr;
   m_animationHost = nullptr;
   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(
     WebVector<WebRect>& bounds) {
   WebRange range = compositionRange();
   if (range.isEmpty())
     return false;
 
   LocalFrame* frame = focusedLocalFrameInWidget();
   if (!frame)
@@ skipping 442 matching lines @@
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
   if (!m_imeAcceptEvents)
     return nullptr;
   return focusedLocalFrameInWidget();
 }
 
 }  // namespace blink