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

Unified Diff: Source/core/rendering/RenderView.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/rendering/RenderTreeAsText.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index 8b056b372a6fdb647f9a7b51a80bdedf14e0cd2a..2bd7a989bdea7da2b95ab3ae72e3f1b98b426afb 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -874,7 +874,7 @@ bool RenderView::shouldUsePrintingLayout() const
{
if (!printing() || !m_frameView)
return false;
- return m_frameView->frame()->shouldUsePrintingLayout();
+ return m_frameView->frame().shouldUsePrintingLayout();
}
size_t RenderView::getRetainedWidgets(Vector<RenderWidget*>& renderWidgets)
@@ -1010,7 +1010,7 @@ int RenderView::viewLogicalHeight() const
float RenderView::zoomFactor() const
{
- return m_frameView->frame()->pageZoomFactor();
+ return m_frameView->frame().pageZoomFactor();
}
void RenderView::pushLayoutState(RenderObject* root)
@@ -1113,7 +1113,7 @@ bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const
// FIXME: Remove this main frame check. Same concept applies to subframes too.
Page* page = document().page();
Frame* mainFrame = page ? page->mainFrame() : 0;
- if (!m_frameView || m_frameView->frame() != mainFrame)
+ if (!m_frameView || &m_frameView->frame() != mainFrame)
return false;
return m_frameView->hasOpaqueBackground();
« no previous file with comments | « Source/core/rendering/RenderTreeAsText.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698