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

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

Issue 1107673004: [New Multicolumn] Prevent SVG foreignObject from becoming a spanner. (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/foreignObject-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnFlowThread.cpp
diff --git a/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
index cec603ab62f8d9aa393e8a710ee4925fbfacdf3c..b0c841ac62d4ceb5eb374af1c2908908239f6f26 100644
--- a/Source/core/layout/LayoutMultiColumnFlowThread.cpp
+++ b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
@@ -456,6 +456,11 @@ LayoutUnit LayoutMultiColumnFlowThread::skipColumnSpanner(LayoutBox* renderer, L
// inserted, certain types of objects should be skipped.
static bool shouldSkipInsertedOrRemovedChild(const LayoutObject& child)
{
+ if (child.isSVG() && !child.isSVGRoot()) {
+ // Don't descend into SVG objects. What's in there is of no interest, and there might even
+ // be a foreignObject there with column-span:all, which doesn't apply to us.
+ return true;
+ }
if (child.isLayoutFlowThread()) {
// Found an inner flow thread. We need to skip it and its descendants.
return true;
« no previous file with comments | « LayoutTests/fast/multicol/span/foreignObject-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698