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

Unified Diff: Source/core/rendering/RenderIFrame.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/core/plugins/IFrameShimSupport.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderIFrame.cpp
diff --git a/Source/core/rendering/RenderIFrame.cpp b/Source/core/rendering/RenderIFrame.cpp
index ffb8f5fba185e685f1e9b52a675bdec27d87fe92..c6328703efda94af742eb7dfc42c431298382f6e 100644
--- a/Source/core/rendering/RenderIFrame.cpp
+++ b/Source/core/rendering/RenderIFrame.cpp
@@ -91,7 +91,7 @@ RenderView* RenderIFrame::contentRootRenderer() const
// FIXME: Is this always a valid cast? What about plugins?
ASSERT(!widget() || widget()->isFrameView());
FrameView* childFrameView = toFrameView(widget());
- return childFrameView ? childFrameView->frame()->contentRenderer() : 0;
+ return childFrameView ? childFrameView->frame().contentRenderer() : 0;
}
void RenderIFrame::layoutSeamlessly()
@@ -114,7 +114,7 @@ void RenderIFrame::layoutSeamlessly()
updateWidgetPosition(); // Notify the Widget of our final height.
// Assert that the child document did a complete layout.
- RenderView* childRoot = childFrameView ? childFrameView->frame()->contentRenderer() : 0;
+ RenderView* childRoot = childFrameView ? childFrameView->frame().contentRenderer() : 0;
ASSERT(!childFrameView || !childFrameView->layoutPending());
ASSERT_UNUSED(childRoot, !childRoot || !childRoot->needsLayout());
}
« no previous file with comments | « Source/core/plugins/IFrameShimSupport.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698