Source/web/PopupContainer.cpp - Issue 23728003: Return Frame&, not Frame* from RenderView::frame()

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/PopupContainer.cpp

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: fixed PopupMenuTest build Created 7 years, 3 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/PopupContainer.cpp

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

index ba815e06e88c8116f245dd5b734254feede7ae42..7290a7d8e4589ce08959e72710d80e622ce0aedd 100644

--- a/Source/web/PopupContainer.cpp

+++ b/Source/web/PopupContainer.cpp

@@ -208,7 +208,7 @@ IntRect PopupContainer::layoutAndCalculateWidgetRect(int targetControlHeight, co

void PopupContainer::showPopup(FrameView* view)

{

m_frameView = view;

- listBox()->m_focusedElement = m_frameView->frame()->document()->focusedElement();

+ listBox()->m_focusedElement = m_frameView->frame().document()->focusedElement();

IntSize transformOffset(m_controlPosition.p4().x() - m_controlPosition.p1().x(), m_controlPosition.p4().y() - m_controlPosition.p1().y() - m_controlSize.height());

chromeClient().popupOpened(this, layoutAndCalculateWidgetRect(m_controlSize.height(), transformOffset, roundedIntPoint(m_controlPosition.p4())), false);

@@ -365,7 +365,7 @@ bool PopupContainer::isInterestedInEventForKey(int keyCode)

ChromeClient& PopupContainer::chromeClient()

{

- return m_frameView->frame()->page()->chrome().client();

+ return m_frameView->frame().page()->chrome().client();

}

void PopupContainer::showInRect(const FloatQuad& controlPosition, const IntSize& controlSize, FrameView* v, int index)

« no previous file with comments | « Source/core/rendering/RenderWidget.cpp ('k') | Source/web/PopupMenuChromium.cpp » ('j') | no next file with comments »