Title: [175383] trunk/Source/WebCore
- Revision
- 175383
- Author
- [email protected]
- Date
- 2014-10-30 14:39:27 -0700 (Thu, 30 Oct 2014)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (175382 => 175383)
--- trunk/Source/WebCore/ChangeLog 2014-10-30 21:35:03 UTC (rev 175382)
+++ trunk/Source/WebCore/ChangeLog 2014-10-30 21:39:27 UTC (rev 175383)
@@ -1,3 +1,16 @@
+2014-10-30 Myles C. Maxfield <[email protected]>
+
+ 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 <[email protected]>
Move -webkit-border-image / -webkit-mask-box-image to the new StyleBuilder
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (175382 => 175383)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-30 21:35:03 UTC (rev 175382)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-30 21:39:27 UTC (rev 175383)
@@ -1588,13 +1588,13 @@
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<unsigned>(renderStyle->hasAutoOrphans() ? 1 : renderStyle->orphans(), renderStyle->hasAutoWidows() ? 1 : renderStyle->widows());
+ unsigned lineCount = std::max<unsigned>(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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
