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

Unified Diff: Source/core/paint/DeprecatedPaintLayer.cpp

Issue 1112593002: [New Multicolumn] Spanners are not part of the nearest ancestor flow thread. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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 | « LayoutTests/fast/multicol/span/as-inner-multicol-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/DeprecatedPaintLayer.cpp
diff --git a/Source/core/paint/DeprecatedPaintLayer.cpp b/Source/core/paint/DeprecatedPaintLayer.cpp
index e1d9bc4864943ad3ccecd6146362164b0a87b738..3299457efa2bc5f3bb2e655ad6d3cf504f228474 100644
--- a/Source/core/paint/DeprecatedPaintLayer.cpp
+++ b/Source/core/paint/DeprecatedPaintLayer.cpp
@@ -522,16 +522,21 @@ void DeprecatedPaintLayer::updatePagination()
if (m_stackingNode->isNormalFlowOnly()) {
if (usesRegionBasedColumns) {
- // Content inside a transform is not considered to be paginated, since we simply
- // paint the transform multiple times in each column, so we don't have to use
- // fragments for the transformed content.
- m_enclosingPaginationLayer = parent()->enclosingPaginationLayer();
- if (m_enclosingPaginationLayer && m_enclosingPaginationLayer->hasTransformRelatedProperty())
- m_enclosingPaginationLayer = 0;
+ // We cannot take the fast path for spanners, as they do not have their nearest ancestor
+ // pagination layer (flow thread) in their containing block chain.
+ if (!layoutObject()->isColumnSpanAll()) {
+ // Content inside a transform is not considered to be paginated, since we simply
+ // paint the transform multiple times in each column, so we don't have to use
+ // fragments for the transformed content.
+ m_enclosingPaginationLayer = parent()->enclosingPaginationLayer();
+ if (m_enclosingPaginationLayer && m_enclosingPaginationLayer->hasTransformRelatedProperty())
+ m_enclosingPaginationLayer = 0;
+ return;
+ }
} else {
m_isPaginated = parent()->layoutObject()->hasColumns();
+ return;
}
- return;
}
// For the new columns code, we want to walk up our containing block chain looking for an enclosing layer. Once
« no previous file with comments | « LayoutTests/fast/multicol/span/as-inner-multicol-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698