Source/web/ExternalPopupMenu.cpp - Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods.

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: Source/web/ExternalPopupMenu.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 5 years, 9 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/web/ExternalPopupMenu.cpp

diff --git a/Source/web/ExternalPopupMenu.cpp b/Source/web/ExternalPopupMenu.cpp

index b01af68628a23aab494fadb27771d0b7923dcb80..2e3b43bbb6e89fd0c0f404d0536344da8d09b19f 100644

--- a/Source/web/ExternalPopupMenu.cpp

+++ b/Source/web/ExternalPopupMenu.cpp

@@ -86,10 +86,7 @@ void ExternalPopupMenu::show(const FloatQuad& controlPosition, const IntSize&, i

WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(m_localFrame.get());

m_webExternalPopupMenu = webframe->client()->createExternalPopupMenu(info, this);

if (m_webExternalPopupMenu) {

- // FIXME: Standardize viewport coordinate conversions. crbug.com/371902.

- IntRect rectInViewport = m_localFrame->view()->contentsToWindow(rect);

- if (m_webView.pinchVirtualViewportEnabled())

- rectInViewport.moveBy(-flooredIntPoint(m_webView.page()->frameHost().pinchViewport().location()));

+ IntRect rectInViewport = m_localFrame->view()->soonToBeRemovedContentsToUnscaledViewport(rect);

m_webExternalPopupMenu->show(rectInViewport);

#if OS(MACOSX)

const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent();

« no previous file with comments | « Source/web/ContextMenuClientImpl.cpp ('k') | Source/web/LinkHighlight.cpp » ('j') | no next file with comments »