Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

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

Issue 2748973002: Strictly unbreakable objects need to prevent interaction with the outside. (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4925afa3a5f17a4c8a34c19f15032eaa7e687226..0bec7dec947f2a08f7786344fa67cbddf3a316b8 100644
--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
@@ -598,17 +598,17 @@ bool LayoutMultiColumnFlowThread::removeSpannerPlaceholderIfNoLongerValid(
return true;
}
-LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::enclosingFlowThread()
- const {
+LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::enclosingFlowThread(
+ AncestorSearchConstraint constraint) 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;
+ if (!multiColumnBlockFlow()->isInsideFlowThread())
+ return nullptr;
+ return toLayoutMultiColumnFlowThread(
+ locateFlowThreadContainingBlockOf(*multiColumnBlockFlow(), constraint));
}
FragmentationContext*
@@ -621,7 +621,7 @@ LayoutMultiColumnFlowThread::enclosingFragmentationContext(
if (constraint == IsolateUnbreakableContainers &&
multiColumnBlockFlow()->getPaginationBreakability() == ForbidBreaks)
return nullptr;
- if (auto* enclosingFlowThread = this->enclosingFlowThread())
+ if (auto* enclosingFlowThread = this->enclosingFlowThread(constraint))
return enclosingFlowThread;
return view()->fragmentationContext();
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698