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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

Issue 1660863002: Force all LayoutUnit construction to be explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also fix LayoutRectTest.cpp Created 4 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 LayoutUnit LayoutMultiColumnFlowThread::maxColumnLogicalHeight() const 278 LayoutUnit LayoutMultiColumnFlowThread::maxColumnLogicalHeight() const
279 { 279 {
280 if (m_columnHeightAvailable) { 280 if (m_columnHeightAvailable) {
281 // If height is non-auto, it's already constrained against max-height as well. 281 // If height is non-auto, it's already constrained against max-height as well.
282 // Just return it. 282 // Just return it.
283 return m_columnHeightAvailable; 283 return m_columnHeightAvailable;
284 } 284 }
285 const LayoutBlockFlow* multicolBlock = multiColumnBlockFlow(); 285 const LayoutBlockFlow* multicolBlock = multiColumnBlockFlow();
286 Length logicalMaxHeight = multicolBlock->style()->logicalMaxHeight(); 286 Length logicalMaxHeight = multicolBlock->style()->logicalMaxHeight();
287 if (!logicalMaxHeight.isMaxSizeNone()) { 287 if (!logicalMaxHeight.isMaxSizeNone()) {
288 LayoutUnit resolvedLogicalMaxHeight = multicolBlock->computeContentLogic alHeight(MaxSize, logicalMaxHeight, -1); 288 LayoutUnit resolvedLogicalMaxHeight = multicolBlock->computeContentLogic alHeight(MaxSize, logicalMaxHeight, LayoutUnit(-1));
289 if (resolvedLogicalMaxHeight != -1) 289 if (resolvedLogicalMaxHeight != -1)
290 return resolvedLogicalMaxHeight; 290 return resolvedLogicalMaxHeight;
291 } 291 }
292 return LayoutUnit::max(); 292 return LayoutUnit::max();
293 } 293 }
294 294
295 LayoutUnit LayoutMultiColumnFlowThread::tallestUnbreakableLogicalHeight(LayoutUn it offsetInFlowThread) const 295 LayoutUnit LayoutMultiColumnFlowThread::tallestUnbreakableLogicalHeight(LayoutUn it offsetInFlowThread) const
296 { 296 {
297 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offsetInFlowT hread)) 297 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offsetInFlowT hread))
298 return multicolSet->tallestUnbreakableLogicalHeight(); 298 return multicolSet->tallestUnbreakableLogicalHeight();
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 } 975 }
976 if (canContainSpannerInParentFragmentationContext(*object)) 976 if (canContainSpannerInParentFragmentationContext(*object))
977 next = object->nextInPreOrder(&root); 977 next = object->nextInPreOrder(&root);
978 else 978 else
979 next = object->nextInPreOrderAfterChildren(&root); 979 next = object->nextInPreOrderAfterChildren(&root);
980 } 980 }
981 return true; 981 return true;
982 } 982 }
983 983
984 } // namespace blink 984 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGeometryMap.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698