Source/core/layout/LayoutBlockFlow.cpp - Issue 1122323002: Cleanup: Remove LayoutRegion.

Unified Diff: Source/core/layout/LayoutBlockFlow.cpp

Issue 1122323002: Cleanup: Remove LayoutRegion. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase master Created 5 years, 7 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:

Index: Source/core/layout/LayoutBlockFlow.cpp

diff --git a/Source/core/layout/LayoutBlockFlow.cpp b/Source/core/layout/LayoutBlockFlow.cpp

index 1c09af33a5d6ef770b065672bbfafa6b86abc689..40f01f81436b7517574d9b64912f659e33c9ac2b 100644

--- a/Source/core/layout/LayoutBlockFlow.cpp

+++ b/Source/core/layout/LayoutBlockFlow.cpp

@@ -829,7 +829,7 @@ void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, La

lineBox.setPaginationStrut(0);

lineBox.setIsFirstAfterPageBreak(false);

LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);

- bool hasUniformPageLogicalHeight = !flowThread || flowThread->regionsHaveUniformLogicalHeight();

+ bool hasUniformPageLogicalHeight = !flowThread || flowThread->columnSetsHaveUniformLogicalHeight();

// If lineHeight is greater than pageLogicalHeight, but logicalVisualOverflow.height() still fits, we are

// still going to add a strut, so that the visible overflow fits on a single page.

if (!pageLogicalHeight || (hasUniformPageLogicalHeight && logicalVisualOverflow.height() > pageLogicalHeight)) {

@@ -1743,7 +1743,7 @@ LayoutUnit LayoutBlockFlow::applyBeforeBreak(LayoutBox& child, LayoutUnit logica

if (checkColumnBreaks) {

if (isInsideMulticolFlowThread) {

LayoutUnit offsetBreakAdjustment = 0;

- if (flowThread->addForcedRegionBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset, &child, true, &offsetBreakAdjustment))

+ if (flowThread->addForcedColumnBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset, &child, true, &offsetBreakAdjustment))

return logicalOffset + offsetBreakAdjustment;

} else {

view()->layoutState()->addForcedColumnBreak(child, logicalOffset);

@@ -1770,7 +1770,7 @@ LayoutUnit LayoutBlockFlow::applyAfterBreak(LayoutBox& child, LayoutUnit logical

if (checkColumnBreaks) {

if (isInsideMulticolFlowThread) {

LayoutUnit offsetBreakAdjustment = 0;

- if (flowThread->addForcedRegionBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset, &child, false, &offsetBreakAdjustment))

+ if (flowThread->addForcedColumnBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset, &child, false, &offsetBreakAdjustment))

return logicalOffset + offsetBreakAdjustment;

} else {

view()->layoutState()->addForcedColumnBreak(child, logicalOffset);

@@ -2562,7 +2562,7 @@ void LayoutBlockFlow::addIntrudingFloats(LayoutBlockFlow* prev, LayoutUnit logic

void LayoutBlockFlow::addOverhangingFloats(LayoutBlockFlow* child, bool makeChildPaintOtherFloats)

{

// Prevent floats from being added to the canvas by the root element, e.g., <html>.

- if (!child->containsFloats() || child->isLayoutRegion() || child->createsNewFormattingContext())

+ if (!child->containsFloats() || child->createsNewFormattingContext())

return;

LayoutUnit childLogicalTop = child->logicalTop();

« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | no next file with comments »