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

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

Issue 1131283004: Prevent SVG children from participating in an ancestor multicol context. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Initialize m_isPaginated and m_pageLogicalHeightChanged. Created 5 years, 7 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 744412af8da58ffbd65a43c665cd31996f063b78..58beb493c2c9a9aecb3af133ec32d5db605fca47 100644
--- a/Source/core/layout/LayoutState.cpp
+++ b/Source/core/layout/LayoutState.cpp
@@ -83,6 +83,11 @@ LayoutState::LayoutState(LayoutBox& layoutObject, const LayoutSize& offset, Layo
m_layoutOffset.height() + (!isFlipped ? layoutObject.borderTop() + layoutObject.paddingTop() : layoutObject.borderBottom() + layoutObject.paddingBottom()));
m_pageLogicalHeightChanged = pageLogicalHeightChanged;
m_isPaginated = true;
+ } else if (m_layoutObject.isSVG() && !m_layoutObject.isSVGRoot()) {
+ // Pagination inside SVG is not allowed.
+ m_flowThread = nullptr;
+ m_pageLogicalHeightChanged = false;
+ m_isPaginated = false;
} else {
// If we don't establish a new page height, then propagate the old page height and offset down.
m_pageLogicalHeight = m_next->m_pageLogicalHeight;
« 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