From 1cc29745e4f5b22a56d2046303871caa3fda1e2a Mon Sep 17 00:00:00 2001 From: "mmaxfield@apple.com" Date: Thu, 30 Oct 2014 21:39:27 +0000 Subject: [PATCH] Use references in calculateMinimumPageHeight() for non-optional arguments https://bugs.webkit.org/show_bug.cgi?id=138231 Reviewed by Dean Jackson. No new tests because there is no behavior change. * rendering/RenderBlockFlow.cpp: (WebCore::calculateMinimumPageHeight): (WebCore::RenderBlockFlow::adjustLinePositionForPagination): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@175383 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 13 +++++++++++++ Source/WebCore/rendering/RenderBlockFlow.cpp | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 1d7d0f0b1b7c..fb84a981e510 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2014-10-30 Myles C. Maxfield + + Use references in calculateMinimumPageHeight() for non-optional arguments + https://bugs.webkit.org/show_bug.cgi?id=138231 + + Reviewed by Dean Jackson. + + No new tests because there is no behavior change. + + * rendering/RenderBlockFlow.cpp: + (WebCore::calculateMinimumPageHeight): + (WebCore::RenderBlockFlow::adjustLinePositionForPagination): + 2014-10-30 Chris Dumez Move -webkit-border-image / -webkit-mask-box-image to the new StyleBuilder diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp index 041acf706a4a..6d4937243aa9 100644 --- a/Source/WebCore/rendering/RenderBlockFlow.cpp +++ b/Source/WebCore/rendering/RenderBlockFlow.cpp @@ -1588,13 +1588,13 @@ LayoutUnit RenderBlockFlow::adjustBlockChildForPagination(LayoutUnit logicalTopA return result; } -static inline LayoutUnit calculateMinimumPageHeight(RenderStyle* renderStyle, RootInlineBox* lastLine, LayoutUnit lineTop, LayoutUnit lineBottom) +static inline LayoutUnit calculateMinimumPageHeight(RenderStyle& renderStyle, RootInlineBox& lastLine, LayoutUnit lineTop, LayoutUnit lineBottom) { // We may require a certain minimum number of lines per page in order to satisfy // orphans and widows, and that may affect the minimum page height. - unsigned lineCount = std::max(renderStyle->hasAutoOrphans() ? 1 : renderStyle->orphans(), renderStyle->hasAutoWidows() ? 1 : renderStyle->widows()); + unsigned lineCount = std::max(renderStyle.hasAutoOrphans() ? 1 : renderStyle.orphans(), renderStyle.hasAutoWidows() ? 1 : renderStyle.widows()); if (lineCount > 1) { - RootInlineBox* line = lastLine; + RootInlineBox* line = &lastLine; for (unsigned i = 1; i < lineCount && line->prevRootBox(); i++) line = line->prevRootBox(); @@ -1632,7 +1632,7 @@ void RenderBlockFlow::adjustLinePositionForPagination(RootInlineBox* lineBox, La LayoutUnit logicalOffset = std::min(lineBox->lineTopWithLeading(), logicalVisualOverflow.y()); LayoutUnit logicalBottom = std::max(lineBox->lineBottomWithLeading(), logicalVisualOverflow.maxY()); LayoutUnit lineHeight = logicalBottom - logicalOffset; - updateMinimumPageHeight(logicalOffset, calculateMinimumPageHeight(&style(), lineBox, logicalOffset, logicalBottom)); + updateMinimumPageHeight(logicalOffset, calculateMinimumPageHeight(style(), *lineBox, logicalOffset, logicalBottom)); logicalOffset += delta; lineBox->setPaginationStrut(0); lineBox->setIsFirstAfterPageBreak(false); -- 2.36.0