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 393400ad54a903deb368a1e189c1de27e40b098c..b9d2c43d83b91f252df8eed297ee1544069ba39c 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp |
@@ -612,9 +612,16 @@ LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::enclosingFlowThread() |
} |
FragmentationContext* |
-LayoutMultiColumnFlowThread::enclosingFragmentationContext() const { |
- if (LayoutMultiColumnFlowThread* enclosingFlowThread = |
- this->enclosingFlowThread()) |
+LayoutMultiColumnFlowThread::enclosingFragmentationContext( |
+ AncestorSearchConstraint constraint) const { |
+ // If this multicol container is strictly unbreakable (due to having |
+ // scrollbars, for instance), it's also strictly unbreakable in any outer |
+ // fragmentation context. As such, what kind of fragmentation that goes on |
+ // inside this multicol container is completely opaque to the ancestors. |
+ if (constraint == IsolateUnbreakableContainers && |
+ multiColumnBlockFlow()->getPaginationBreakability() == ForbidBreaks) |
+ return nullptr; |
+ if (auto* enclosingFlowThread = this->enclosingFlowThread()) |
return enclosingFlowThread; |
return view()->fragmentationContext(); |
} |