third_party/WebKit/Source/core/frame/WebFrameWidgetBase.cpp - Issue 2910233002: Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/frame/WebFrameWidgetBase.cpp

Issue 2910233002: Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget() (Closed)

Patch Set: Rebased Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

diff --git a/third_party/WebKit/Source/core/frame/WebFrameWidgetBase.cpp b/third_party/WebKit/Source/core/frame/WebFrameWidgetBase.cpp

index 136f83c421fbbda05cfe73bcac673214f0ec0130..3e7e95d2edc19f944a3a7ff1f9c56823d2fc61db 100644

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

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

@@ -238,7 +238,7 @@ Page* WebFrameWidgetBase::GetPage() const {

void WebFrameWidgetBase::DidAcquirePointerLock() {

GetPage()->GetPointerLockController().DidAcquirePointerLock();

- LocalFrame* focusedFrame = FocusedLocalFrameInWidget();

+ LocalFrame* focusedFrame = FocusedLocalFrame();

if (focusedFrame) {

focusedFrame->GetEventHandler().ReleaseMousePointerCapture();

}

@@ -269,7 +269,7 @@ void WebFrameWidgetBase::PointerLockMouseEvent(

WebMouseEvent transformed_event = TransformWebMouseEvent(

ToWebLocalFrameBase(LocalRoot())->GetFrameView(), mouse_event);

- LocalFrame* focusedFrame = FocusedLocalFrameInWidget();

+ LocalFrame* focusedFrame = FocusedLocalFrame();

if (focusedFrame) {

focusedFrame->GetEventHandler().ProcessPendingPointerCaptureForPointerLock(

transformed_event);

@@ -323,7 +323,7 @@ void WebFrameWidgetBase::ShowContextMenu(WebMenuSourceType source_type) {

}

-LocalFrame* WebFrameWidgetBase::FocusedLocalFrameInWidget() const {

+LocalFrame* WebFrameWidgetBase::FocusedLocalFrame() const {

LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();

return (frame && frame->LocalFrameRoot() == ToCoreFrame(LocalRoot()))

? frame