| Index: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| index e073f78a84b14ccc67814990d484ab39f2a8d492..b99ee7b7d3b7379ca7611512823a823f7dd33423 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
| @@ -436,6 +436,11 @@ bool LayoutMultiColumnFlowThread::removeSpannerPlaceholderIfNoLongerValid(Layout
|
|
|
| LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::enclosingFlowThread() const
|
| {
|
| + if (isLayoutPagedFlowThread()) {
|
| + // Paged overflow containers should never be fragmented by enclosing fragmentation
|
| + // contexts. They are to be treated as unbreakable content.
|
| + return nullptr;
|
| + }
|
| if (multiColumnBlockFlow()->isInsideFlowThread())
|
| return toLayoutMultiColumnFlowThread(locateFlowThreadContainingBlockOf(*multiColumnBlockFlow()));
|
| return nullptr;
|
| @@ -470,7 +475,7 @@ void LayoutMultiColumnFlowThread::appendNewFragmentainerGroupIfNeeded(LayoutUnit
|
| FragmentationContext* enclosingFragmentationContext = this->enclosingFragmentationContext();
|
| if (!enclosingFragmentationContext)
|
| return; // Not nested. We'll never need more rows than the one we already have then.
|
| -
|
| + ASSERT(!isLayoutPagedFlowThread());
|
| // We have run out of columns here, so we add another row to hold more columns. When we add
|
| // a new row, it implicitly means that we're inserting another column in our enclosing
|
| // multicol container. That in turn may mean that we've run out of columns there too.
|
|
|