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

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 23483024: Assume FrameView::m_frame is never NULL (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/plugins/IFrameShimSupport.cpp ('k') | no next file » | 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 cae73a2fbe79056a63d1ff451a2140612e858127..091c05f083b167375ed52f20bb07df87365f4390 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -874,8 +874,7 @@ bool RenderView::shouldUsePrintingLayout() const
{
if (!printing() || !m_frameView)
return false;
- Frame* frame = m_frameView->frame();
- return frame && frame->shouldUsePrintingLayout();
+ return m_frameView->frame()->shouldUsePrintingLayout();
}
size_t RenderView::getRetainedWidgets(Vector<RenderWidget*>& renderWidgets)
@@ -1011,8 +1010,7 @@ int RenderView::viewLogicalHeight() const
float RenderView::zoomFactor() const
{
- Frame* frame = m_frameView->frame();
- return frame ? frame->pageZoomFactor() : 1;
+ return m_frameView->frame()->pageZoomFactor();
}
void RenderView::pushLayoutState(RenderObject* root)
« no previous file with comments | « Source/core/plugins/IFrameShimSupport.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698