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

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

Issue 712553003: [New Multicolumn] Actual support for layout of column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code review. Camelize. Created 6 years 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 | « Source/core/rendering/LayoutState.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | 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 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 1534
1535 IntRect inflatedRect = pixelSnappedBorderBoxRect(); 1535 IntRect inflatedRect = pixelSnappedBorderBoxRect();
1536 RenderTheme::theme().adjustPaintInvalidationRect(this, inflatedRect); 1536 RenderTheme::theme().adjustPaintInvalidationRect(this, inflatedRect);
1537 addVisualOverflow(inflatedRect); 1537 addVisualOverflow(inflatedRect);
1538 } 1538 }
1539 1539
1540 bool RenderBlock::createsNewFormattingContext() const 1540 bool RenderBlock::createsNewFormattingContext() const
1541 { 1541 {
1542 return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated() 1542 return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated()
1543 || style()->specifiesColumns() || isRenderFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() 1543 || style()->specifiesColumns() || isRenderFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot()
1544 || isDocumentElement() || style()->columnSpan() || isGridItem(); 1544 || isDocumentElement() || (document().regionBasedColumnsEnabled() ? isCo lumnSpanAll() : style()->columnSpan()) || isGridItem();
1545 } 1545 }
1546 1546
1547 void RenderBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, R enderBox* child) 1547 void RenderBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, R enderBox* child)
1548 { 1548 {
1549 // FIXME: Technically percentage height objects only need a relayout if thei r percentage isn't going to be turned into 1549 // FIXME: Technically percentage height objects only need a relayout if thei r percentage isn't going to be turned into
1550 // an auto value. Add a method to determine this, so that we can avoid the r elayout. 1550 // an auto value. Add a method to determine this, so that we can avoid the r elayout.
1551 if (relayoutChildren || (child->hasRelativeLogicalHeight() && !isRenderView( ))) 1551 if (relayoutChildren || (child->hasRelativeLogicalHeight() && !isRenderView( )))
1552 child->setChildNeedsLayout(MarkOnlyThis); 1552 child->setChildNeedsLayout(MarkOnlyThis);
1553 1553
1554 // If relayoutChildren is set and the child has percentage padding or an emb edded content box, we also need to invalidate the childs pref widths. 1554 // If relayoutChildren is set and the child has percentage padding or an emb edded content box, we also need to invalidate the childs pref widths.
(...skipping 2371 matching lines...) Expand 10 before | Expand all | Expand 10 after
3926 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 3926 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
3927 { 3927 {
3928 showRenderObject(); 3928 showRenderObject();
3929 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3929 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3930 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3930 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3931 } 3931 }
3932 3932
3933 #endif 3933 #endif
3934 3934
3935 } // namespace blink 3935 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/LayoutState.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698