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

Unified Diff: Source/core/layout/LayoutState.cpp

Issue 1108633002: [New Multicolumn] Only the nearest ancestral flow thread may serve as a containing flow thread. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: code review. 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 | « Source/core/layout/LayoutObject.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutState.cpp
diff --git a/Source/core/layout/LayoutState.cpp b/Source/core/layout/LayoutState.cpp
index 6f94933777207c0135cb8775a6a04cf7eb9a17a8..c14f2dfb4dae29220ad6cacb371d6a98f72a7175 100644
--- a/Source/core/layout/LayoutState.cpp
+++ b/Source/core/layout/LayoutState.cpp
@@ -52,7 +52,12 @@ LayoutState::LayoutState(LayoutBox& renderer, const LayoutSize& offset, LayoutUn
, m_next(renderer.view()->layoutState())
, m_renderer(renderer)
{
- m_flowThread = renderer.isLayoutFlowThread() ? toLayoutFlowThread(&renderer) : m_next->flowThread();
+ if (renderer.isLayoutFlowThread())
+ m_flowThread = toLayoutFlowThread(&renderer);
+ else if (!renderer.isOutOfFlowPositioned() && !renderer.isColumnSpanAll())
+ m_flowThread = m_next->flowThread();
+ else
+ m_flowThread = nullptr;
renderer.view()->pushLayoutState(*this);
bool fixed = renderer.isOutOfFlowPositioned() && renderer.style()->position() == FixedPosition;
if (fixed) {
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698