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

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

Issue 23819019: Refactor fixed layout mode (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index e1ab0f869ed6606ca262ca9650157a4c85e83ece..00a9a18c065bd68b74713b38f7fd507540021d84 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -977,20 +977,18 @@ IntRect RenderView::documentRect() const
int RenderView::viewHeight() const
{
int height = 0;
- if (!shouldUsePrintingLayout() && m_frameView) {
- height = m_frameView->layoutHeight();
- height = m_frameView->useFixedLayout() ? ceilf(style()->effectiveZoom() * float(height)) : height;
- }
+ if (!shouldUsePrintingLayout() && m_frameView)
+ height = m_frameView->layoutSize().height();
+
return height;
}
int RenderView::viewWidth() const
{
int width = 0;
- if (!shouldUsePrintingLayout() && m_frameView) {
- width = m_frameView->layoutWidth();
- width = m_frameView->useFixedLayout() ? ceilf(style()->effectiveZoom() * float(width)) : width;
- }
+ if (!shouldUsePrintingLayout() && m_frameView)
+ width = m_frameView->layoutSize().width();
+
return width;
}

Powered by Google App Engine
This is Rietveld 408576698