Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2551)

Unified Diff: Source/web/WebPluginContainerImpl.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
« no previous file with comments | « Source/web/WebDevToolsAgentImpl.cpp ('k') | Source/web/tests/PopupMenuTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebPluginContainerImpl.cpp
diff --git a/Source/web/WebPluginContainerImpl.cpp b/Source/web/WebPluginContainerImpl.cpp
index 1f77fd00662e66a03be3da8ed006a621a8fb54de..85209799e30ea93893edebf5b968d4a88738a44d 100644
--- a/Source/web/WebPluginContainerImpl.cpp
+++ b/Source/web/WebPluginContainerImpl.cpp
@@ -697,7 +697,7 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event)
// A windowless plugin can change the cursor in response to a mouse move
// event. We need to reflect the changed cursor in the frame view as the
// mouse is moved in the boundaries of the windowless plugin.
- Page* page = parentView->frame()->page();
+ Page* page = parentView->frame().page();
if (!page)
return;
ChromeClientImpl* chromeClient = static_cast<ChromeClientImpl*>(&page->chrome().client());
@@ -852,11 +852,11 @@ void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event)
void WebPluginContainerImpl::focusPlugin()
{
- Frame* containingFrame = static_cast<FrameView*>(parent())->frame();
- if (Page* currentPage = containingFrame->page())
- currentPage->focusController().setFocusedElement(m_element, containingFrame);
+ Frame& containingFrame = static_cast<FrameView*>(parent())->frame();
+ if (Page* currentPage = containingFrame.page())
+ currentPage->focusController().setFocusedElement(m_element, &containingFrame);
else
- containingFrame->document()->setFocusedElement(m_element);
+ containingFrame.document()->setFocusedElement(m_element);
}
void WebPluginContainerImpl::calculateGeometry(const IntRect& frameRect,
« no previous file with comments | « Source/web/WebDevToolsAgentImpl.cpp ('k') | Source/web/tests/PopupMenuTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698