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

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

Issue 179763003: [New multicol] Make -webkit-column-break-inside:avoid work. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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
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 5156 matching lines...) Expand 10 before | Expand all | Expand 10 after
5167 remainingHeight = intMod(remainingHeight, pageLogicalHeight); 5167 remainingHeight = intMod(remainingHeight, pageLogicalHeight);
5168 } 5168 }
5169 return remainingHeight; 5169 return remainingHeight;
5170 } 5170 }
5171 5171
5172 return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryR ule); 5172 return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryR ule);
5173 } 5173 }
5174 5174
5175 LayoutUnit RenderBlock::adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOffset, bool includeMargins) 5175 LayoutUnit RenderBlock::adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOffset, bool includeMargins)
5176 { 5176 {
5177 bool checkColumnBreaks = view()->layoutState()->isPaginatingColumns(); 5177 bool checkColumnBreaks = view()->layoutState()->isPaginatingColumns() || flo wThreadContainingBlock();
5178 bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->m_pageLo gicalHeight; 5178 bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->m_pageLo gicalHeight;
5179 bool isUnsplittable = child->isUnsplittableForPagination() || (checkColumnBr eaks && child->style()->columnBreakInside() == PBAVOID) 5179 bool isUnsplittable = child->isUnsplittableForPagination() || (checkColumnBr eaks && child->style()->columnBreakInside() == PBAVOID)
5180 || (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID); 5180 || (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID);
5181 if (!isUnsplittable) 5181 if (!isUnsplittable)
5182 return logicalOffset; 5182 return logicalOffset;
5183 LayoutUnit childLogicalHeight = logicalHeightForChild(child) + (includeMargi ns ? marginBeforeForChild(child) + marginAfterForChild(child) : LayoutUnit()); 5183 LayoutUnit childLogicalHeight = logicalHeightForChild(child) + (includeMargi ns ? marginBeforeForChild(child) + marginAfterForChild(child) : LayoutUnit());
5184 LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset); 5184 LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);
5185 updateMinimumPageHeight(logicalOffset, childLogicalHeight); 5185 updateMinimumPageHeight(logicalOffset, childLogicalHeight);
5186 if (!pageLogicalHeight || childLogicalHeight > pageLogicalHeight) 5186 if (!pageLogicalHeight || childLogicalHeight > pageLogicalHeight)
5187 return logicalOffset; 5187 return logicalOffset;
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
5486 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5486 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5487 { 5487 {
5488 showRenderObject(); 5488 showRenderObject();
5489 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5489 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5490 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5490 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5491 } 5491 }
5492 5492
5493 #endif 5493 #endif
5494 5494
5495 } // namespace WebCore 5495 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698