third_party/WebKit/Source/core/layout/LayoutBox.cpp - Issue 1681273003: Add CSS parser support for break-after, break-before and break-inside.

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1681273003: Add CSS parser support for break-after, break-before and break-inside. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update some text expectations, and move the new properties into ComputedStyle, since they aren't ra… Created 4 years, 10 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

« third_party/WebKit/Source/core/css/CSSValueKeywords.in ('K') | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

index cc651c30bedbc4ec0176463249145f2bd5c54006..3421c7efb0694a392f26f39ac3265166f188eaf6 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

@@ -1907,8 +1907,8 @@ bool LayoutBox::hasForcedBreakBefore() const

LayoutFlowThread* flowThread = flowThreadContainingBlock();

bool checkColumnBreaks = flowThread;

bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->pageLogicalHeight(); // TODO(mstensho): Once columns can print, we have to check this.

- bool checkBeforeAlways = (checkColumnBreaks && style()->columnBreakBefore() == PBALWAYS)

- || (checkPageBreaks && style()->pageBreakBefore() == PBALWAYS);

+ bool checkBeforeAlways = (checkColumnBreaks && style()->breakBefore() == BreakColumn)

+ || (checkPageBreaks && style()->breakBefore() == BreakPage);

return checkBeforeAlways && isForcedBreakAllowed(this);

}

@@ -1917,8 +1917,8 @@ bool LayoutBox::hasForcedBreakAfter() const

LayoutFlowThread* flowThread = flowThreadContainingBlock();

bool checkColumnBreaks = flowThread;

bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->pageLogicalHeight(); // TODO(mstensho): Once columns can print, we have to check this.

- bool checkAfterAlways = (checkColumnBreaks && style()->columnBreakAfter() == PBALWAYS)

- || (checkPageBreaks && style()->pageBreakAfter() == PBALWAYS);

+ bool checkAfterAlways = (checkColumnBreaks && style()->breakAfter() == BreakColumn)

+ || (checkPageBreaks && style()->breakAfter() == BreakPage);

return checkAfterAlways && isForcedBreakAllowed(this);

}

@@ -4224,8 +4224,9 @@ LayoutBox::PaginationBreakability LayoutBox::paginationBreakability() const

bool checkColumnBreaks = flowThreadContainingBlock();

bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->pageLogicalHeight();

- bool isUnsplittable = (checkColumnBreaks && style()->columnBreakInside() == PBAVOID)

- || (checkPageBreaks && style()->pageBreakInside() == PBAVOID);

+ EBreak breakInside = style()->breakInside();

+ bool isUnsplittable = (checkColumnBreaks && (breakInside == BreakAvoid || breakInside == BreakAvoidColumn))

+ || (checkPageBreaks && (breakInside == BreakAvoid || breakInside == BreakAvoidPage));

if (isUnsplittable)

return AvoidBreaks;

return AllowAnyBreaks;