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

Unified Diff: Source/core/rendering/RenderLayer.cpp

Issue 792803002: [New Multicolumn] Layout support for column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@347325-placeholder
Patch Set: Code review. If there are no sets, return early. Created 5 years, 11 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 | « Source/core/rendering/RenderFlowThread.cpp ('k') | Source/core/rendering/RenderMultiColumnFlowThread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index 610e046567f75fcb790c16dee674c4a9542e91ee..7fc3811f35e492369399172d704e5fef4f139eb6 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -818,7 +818,7 @@ bool RenderLayer::updateLayerPosition()
localPoint.moveBy(box->topLeftLocation());
}
- if (!renderer()->isOutOfFlowPositioned() && renderer()->parent()) {
+ if (!renderer()->isOutOfFlowPositioned() && !renderer()->isColumnSpanAll() && renderer()->parent()) {
// We must adjust our position by walking up the render tree looking for the
// nearest enclosing object with a layer.
RenderObject* curr = renderer()->parent();
@@ -1427,8 +1427,14 @@ static inline const RenderLayer* accumulateOffsetTowardsAncestor(const RenderLay
location += (thisCoords - ancestorCoords);
return ancestorLayer;
}
- } else
+ } else if (renderer->isColumnSpanAll()) {
+ RenderBlock* multicolContainer = renderer->containingBlock();
+ ASSERT(toRenderBlockFlow(multicolContainer)->multiColumnFlowThread());
+ parentLayer = multicolContainer->layer();
+ ASSERT(parentLayer);
+ } else {
parentLayer = layer->parent();
+ }
if (!parentLayer)
return 0;
« no previous file with comments | « Source/core/rendering/RenderFlowThread.cpp ('k') | Source/core/rendering/RenderMultiColumnFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698