Source/web/tests/PopupMenuTest.cpp - Issue 23671002: Refactoring: Add toWebFrameImpl() interface.

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/tests/PopupMenuTest.cpp

Issue 23671002: Refactoring: Add toWebFrameImpl() interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Corrected as per review commments. Created 7 years, 4 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: Source/web/tests/PopupMenuTest.cpp

diff --git a/Source/web/tests/PopupMenuTest.cpp b/Source/web/tests/PopupMenuTest.cpp

index ea57299c0aed4abd5ee5489a5dfe51de61d5fa0c..a09ab924c6a242199396e52c75297d684cbbc22c 100644

--- a/Source/web/tests/PopupMenuTest.cpp

+++ b/Source/web/tests/PopupMenuTest.cpp

@@ -187,7 +187,7 @@ protected:

{

m_webView = toWebViewImpl(WebView::create(&m_webviewClient));

m_webView->initializeMainFrame(&m_webFrameClient);

- m_popupMenu = adoptRef(new PopupMenuChromium(*static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame(), &m_popupMenuClient));

+ m_popupMenu = adoptRef(new PopupMenuChromium(*toWebFrameImpl(m_webView->mainFrame())->frame(), &m_popupMenuClient));

}

virtual void TearDown()

@@ -407,7 +407,7 @@ TEST_F(SelectPopupMenuTest, DISABLED_SelectItemEventFire)

loadFrame(m_webView->mainFrame(), "select_event.html");

serveRequests();

- m_popupMenuClient.setFocusedNode(static_cast<WebFrameImpl*>(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

+ m_popupMenuClient.setFocusedNode(toWebFrameImpl(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

showPopup();

@@ -452,7 +452,7 @@ TEST_F(SelectPopupMenuTest, FLAKY_SelectItemKeyEvent)

loadFrame(m_webView->mainFrame(), "select_event.html");

serveRequests();

- m_popupMenuClient.setFocusedNode(static_cast<WebFrameImpl*>(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

+ m_popupMenuClient.setFocusedNode(toWebFrameImpl(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

showPopup();

@@ -474,7 +474,7 @@ TEST_F(SelectPopupMenuTest, SelectItemRemoveSelectOnChange)

loadFrame(m_webView->mainFrame(), "select_event_remove_on_change.html");

serveRequests();

- m_popupMenuClient.setFocusedNode(static_cast<WebFrameImpl*>(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

+ m_popupMenuClient.setFocusedNode(toWebFrameImpl(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

showPopup();

@@ -496,7 +496,7 @@ TEST_F(SelectPopupMenuTest, SelectItemRemoveSelectOnClick)

loadFrame(m_webView->mainFrame(), "select_event_remove_on_click.html");

serveRequests();

- m_popupMenuClient.setFocusedNode(static_cast<WebFrameImpl*>(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

+ m_popupMenuClient.setFocusedNode(toWebFrameImpl(m_webView->mainFrame())->frameView()->frame()->document()->focusedElement());

showPopup();