No pointer captured when the pointer lock is applied

third_party/WebKit/Source/core/frame/WebFrameWidgetBase.cpp

 // Copyright 2016 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 "core/frame/WebFrameWidgetBase.h"
 
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/events/WebInputEventConversion.h"
 #include "core/exported/WebViewBase.h"
 #include "core/frame/LocalFrameView.h"
@@ skipping 220 matching lines @@
 WebViewBase* WebFrameWidgetBase::View() const {
   return ToWebLocalFrameBase(LocalRoot())->ViewImpl();
 }
 
 Page* WebFrameWidgetBase::GetPage() const {
   return View()->GetPage();
 }
 
 void WebFrameWidgetBase::DidAcquirePointerLock() {
   GetPage()->GetPointerLockController().DidAcquirePointerLock();
+
+  LocalFrame* focusedFrame = FocusedLocalFrameInWidget();
+  if (focusedFrame) {
+    focusedFrame->GetEventHandler().ReleaseMousePointerCapture();
+  }
 }
 
 void WebFrameWidgetBase::DidNotAcquirePointerLock() {
   GetPage()->GetPointerLockController().DidNotAcquirePointerLock();
 }
 
 void WebFrameWidgetBase::DidLosePointerLock() {
   pointer_lock_gesture_token_.Clear();
   GetPage()->GetPointerLockController().DidLosePointerLock();
 }
 
-void WebFrameWidgetBase::PointerLockMouseEvent(const WebInputEvent& event) {
+// TODO(665924): Remove direct dispatches of mouse events from
+// PointerLockController, instead passing them through EventHandler.
+void WebFrameWidgetBase::PointerLockMouseEvent(
+    const WebCoalescedInputEvent& coalesced_event) {
+  const WebInputEvent& input_event = coalesced_event.Event();
+  const WebMouseEvent& mouse_event =
+      static_cast<const WebMouseEvent&>(input_event);
+  WebMouseEvent transformed_event = TransformWebMouseEvent(
+      ToWebLocalFrameBase(LocalRoot())->GetFrameView(), mouse_event);
+
+  LocalFrame* focusedFrame = FocusedLocalFrameInWidget();
+  if (focusedFrame) {
+    focusedFrame->GetEventHandler().ProcessPendingPointerCaptureForPointerLock(
+        transformed_event);
+  }
+
   std::unique_ptr<UserGestureIndicator> gesture_indicator;
   AtomicString event_type;
-  switch (event.GetType()) {
+  switch (input_event.GetType()) {
     case WebInputEvent::kMouseDown:
       event_type = EventTypeNames::mousedown;
       if (!GetPage() || !GetPage()->GetPointerLockController().GetElement())
         break;
       gesture_indicator = WTF::WrapUnique(new UserGestureIndicator(
           DocumentUserGestureToken::Create(&GetPage()
                                                 ->GetPointerLockController()
                                                 .GetElement()
                                                 ->GetDocument(),
                                            UserGestureToken::kNewGesture)));
       pointer_lock_gesture_token_ = gesture_indicator->CurrentToken();
       break;
     case WebInputEvent::kMouseUp:
       event_type = EventTypeNames::mouseup;
       gesture_indicator = WTF::WrapUnique(
           new UserGestureIndicator(std::move(pointer_lock_gesture_token_)));
       break;
     case WebInputEvent::kMouseMove:
       event_type = EventTypeNames::mousemove;
       break;
     default:
       NOTREACHED();
   }
 
-  const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
-
   if (GetPage()) {
-    WebMouseEvent transformed_event = TransformWebMouseEvent(
-        ToWebLocalFrameBase(LocalRoot())->GetFrameView(), mouse_event);
     GetPage()->GetPointerLockController().DispatchLockedMouseEvent(
         transformed_event, event_type);
   }
 }
 
 void WebFrameWidgetBase::ShowContextMenu(WebMenuSourceType source_type) {
   if (!GetPage())
     return;
 
   GetPage()->GetContextMenuController().ClearContextMenu();
   {
     ContextMenuAllowedScope scope;
     if (LocalFrame* focused_frame =
             GetPage()->GetFocusController().FocusedFrame()) {
       focused_frame->GetEventHandler().ShowNonLocatedContextMenu(nullptr,
                                                                  source_type);
     }
   }
 }
 
+LocalFrame* WebFrameWidgetBase::FocusedLocalFrameInWidget() const {
+  LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();
+  return (frame && frame->LocalFrameRoot() == ToCoreFrame(LocalRoot()))
+             ? frame
+             : nullptr;
+}
+
 }  // namespace blink