LayoutFlowThread parameter to adjustLinePositionForPagination() is now unused.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1215343004
git-svn-id: svn://svn.chromium.org/blink/trunk@198535 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/Source/core/layout/LayoutBlockFlow.cpp b/Source/core/layout/LayoutBlockFlow.cpp
index c25ca93..1b07bd2 100644
--- a/Source/core/layout/LayoutBlockFlow.cpp
+++ b/Source/core/layout/LayoutBlockFlow.cpp
@@ -745,7 +745,7 @@
return lineBottom - lineTop;
}
-void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, LayoutUnit& delta, LayoutFlowThread* flowThread)
+void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, LayoutUnit& delta)
{
// FIXME: For now we paginate using line overflow. This ensures that lines don't overlap at all when we
// put a strut between them for pagination purposes. However, this really isn't the desired layout, since
diff --git a/Source/core/layout/LayoutBlockFlow.h b/Source/core/layout/LayoutBlockFlow.h
index 90fd6ab..7f6bfd4 100644
--- a/Source/core/layout/LayoutBlockFlow.h
+++ b/Source/core/layout/LayoutBlockFlow.h
@@ -478,7 +478,7 @@
LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTopAfterClear, LayoutUnit estimateWithoutPagination, LayoutBox& child, bool atBeforeSideOfBlock);
// Computes a deltaOffset value that put a line at the top of the next page if it doesn't fit on the current page.
- void adjustLinePositionForPagination(RootInlineBox&, LayoutUnit& deltaOffset, LayoutFlowThread*);
+ void adjustLinePositionForPagination(RootInlineBox&, LayoutUnit& deltaOffset);
// If the child is unsplittable and can't fit on the current page, return the top of the next page/column.
LayoutUnit adjustForUnsplittableChild(LayoutBox&, LayoutUnit logicalOffset, bool includeMargins = false);
diff --git a/Source/core/layout/LayoutBlockFlowLine.cpp b/Source/core/layout/LayoutBlockFlowLine.cpp
index c256376..9a7a806 100644
--- a/Source/core/layout/LayoutBlockFlowLine.cpp
+++ b/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -859,7 +859,7 @@
if (paginated) {
LayoutUnit adjustment = 0;
- adjustLinePositionForPagination(*lineBox, adjustment, layoutState.flowThread());
+ adjustLinePositionForPagination(*lineBox, adjustment);
if (adjustment) {
LayoutUnit oldLineWidth = availableLogicalWidthForLine(oldLogicalHeight, layoutState.lineInfo().isFirstLine());
lineBox->moveInBlockDirection(adjustment.toFloat());
@@ -988,7 +988,7 @@
line->attachLine();
if (paginated) {
delta -= line->paginationStrut();
- adjustLinePositionForPagination(*line, delta, layoutState.flowThread());
+ adjustLinePositionForPagination(*line, delta);
}
if (delta) {
layoutState.updatePaintInvalidationRangeFromBox(line, delta);
@@ -1649,7 +1649,7 @@
for (curr = firstRootBox(); curr && !curr->isDirty(); curr = curr->nextRootBox()) {
if (paginated) {
paginationDelta -= curr->paginationStrut();
- adjustLinePositionForPagination(*curr, paginationDelta, layoutState.flowThread());
+ adjustLinePositionForPagination(*curr, paginationDelta);
if (paginationDelta) {
if (containsFloats() || !layoutState.floats().isEmpty()) {
// FIXME: Do better eventually. For now if we ever shift because of pagination and floats are present just go to a full layout.
@@ -1819,7 +1819,7 @@
// strut yet.
LayoutUnit oldPaginationStrut = lineBox->paginationStrut();
lineDelta -= oldPaginationStrut;
- adjustLinePositionForPagination(*lineBox, lineDelta, layoutState.flowThread());
+ adjustLinePositionForPagination(*lineBox, lineDelta);
lineBox->setPaginationStrut(oldPaginationStrut);
}
}
