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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 237673006: [New Multicolumn] Stay out of the old multicol machinery for column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/multicol/newmulticol/spanner-inside-child-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 ASSERT(beforeChild->parent() == this); 782 ASSERT(beforeChild->parent() == this);
783 if (beforeChild->parent() != this) { 783 if (beforeChild->parent() != this) {
784 // We should never reach here. If we do, we need to use the 784 // We should never reach here. If we do, we need to use the
785 // safe fallback to use the topmost beforeChild container. 785 // safe fallback to use the topmost beforeChild container.
786 beforeChild = beforeChildContainer; 786 beforeChild = beforeChildContainer;
787 } 787 }
788 } 788 }
789 } 789 }
790 790
791 // Check for a spanning element in columns. 791 // Check for a spanning element in columns.
792 if (gColumnFlowSplitEnabled) { 792 if (gColumnFlowSplitEnabled && !document().regionBasedColumnsEnabled()) {
793 RenderBlockFlow* columnsBlockAncestor = columnsBlockForSpanningElement(n ewChild); 793 RenderBlockFlow* columnsBlockAncestor = columnsBlockForSpanningElement(n ewChild);
794 if (columnsBlockAncestor) { 794 if (columnsBlockAncestor) {
795 TemporaryChange<bool> columnFlowSplitEnabled(gColumnFlowSplitEnabled , false); 795 TemporaryChange<bool> columnFlowSplitEnabled(gColumnFlowSplitEnabled , false);
796 // We are placing a column-span element inside a block. 796 // We are placing a column-span element inside a block.
797 RenderBlockFlow* newBox = createAnonymousColumnSpanBlock(); 797 RenderBlockFlow* newBox = createAnonymousColumnSpanBlock();
798 798
799 if (columnsBlockAncestor != this && !isRenderFlowThread()) { 799 if (columnsBlockAncestor != this && !isRenderFlowThread()) {
800 // We are nested inside a multi-column element and are being spl it by the span. We have to break up 800 // We are nested inside a multi-column element and are being spl it by the span. We have to break up
801 // our block into continuations. 801 // our block into continuations.
802 RenderBoxModelObject* oldContinuation = continuation(); 802 RenderBoxModelObject* oldContinuation = continuation();
(...skipping 4104 matching lines...) Expand 10 before | Expand all | Expand 10 after
4907 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4907 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4908 { 4908 {
4909 showRenderObject(); 4909 showRenderObject();
4910 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4910 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4911 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4911 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4912 } 4912 }
4913 4913
4914 #endif 4914 #endif
4915 4915
4916 } // namespace WebCore 4916 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/newmulticol/spanner-inside-child-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698