Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget()

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/UserGestureIndicator.h"
 #include "core/events/WebInputEventConversion.h"
 #include "core/exported/WebViewBase.h"
 #include "core/frame/LocalFrameView.h"
@@ skipping 220 matching lines @@
   return ToWebLocalFrameBase(LocalRoot())->ViewImpl();
 }
 
 Page* WebFrameWidgetBase::GetPage() const {
   return View()->GetPage();
 }
 
 void WebFrameWidgetBase::DidAcquirePointerLock() {
   GetPage()->GetPointerLockController().DidAcquirePointerLock();
 
-  LocalFrame* focusedFrame = FocusedLocalFrameInWidget();
+  LocalFrame* focusedFrame = FocusedLocalFrame();
   if (focusedFrame) {
     focusedFrame->GetEventHandler().ReleaseMousePointerCapture();
   }
 }
 
 void WebFrameWidgetBase::DidNotAcquirePointerLock() {
   GetPage()->GetPointerLockController().DidNotAcquirePointerLock();
 }
 
 void WebFrameWidgetBase::DidLosePointerLock() {
   pointer_lock_gesture_token_.Clear();
   GetPage()->GetPointerLockController().DidLosePointerLock();
 }
 
 // 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();
+  LocalFrame* focusedFrame = FocusedLocalFrame();
   if (focusedFrame) {
     focusedFrame->GetEventHandler().ProcessPendingPointerCaptureForPointerLock(
         transformed_event);
   }
 
   std::unique_ptr<UserGestureIndicator> gesture_indicator;
   AtomicString event_type;
   switch (input_event.GetType()) {
     case WebInputEvent::kMouseDown:
       event_type = EventTypeNames::mousedown;
@@ skipping 33 matching lines @@
   {
     ContextMenuAllowedScope scope;
     if (LocalFrame* focused_frame =
             GetPage()->GetFocusController().FocusedFrame()) {
       focused_frame->GetEventHandler().ShowNonLocatedContextMenu(nullptr,
                                                                  source_type);
     }
   }
 }
 
-LocalFrame* WebFrameWidgetBase::FocusedLocalFrameInWidget() const {
+LocalFrame* WebFrameWidgetBase::FocusedLocalFrame() const {
   LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();
   return (frame && frame->LocalFrameRoot() == ToCoreFrame(LocalRoot()))
              ? frame
              : nullptr;
 }
 
 }  // namespace blink