| 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 ee49720c5701c7fda347cc86a82bc34600f39e00..b37955701b3eebed8452a23f34920fa18266fdc6 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();
|
| }
|
| @@ -263,7 +263,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);
|
| @@ -317,7 +317,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
|
|
|