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

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

Issue 2508743002: Changed EWhiteSpace to an enum class and renamed its members to keywords (Closed)
Patch Set: Small mac fix Created 4 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
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. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1463 m_minPreferredLogicalWidth += borderAndPadding; 1463 m_minPreferredLogicalWidth += borderAndPadding;
1464 m_maxPreferredLogicalWidth += borderAndPadding; 1464 m_maxPreferredLogicalWidth += borderAndPadding;
1465 1465
1466 clearPreferredLogicalWidthsDirty(); 1466 clearPreferredLogicalWidthsDirty();
1467 } 1467 }
1468 1468
1469 void LayoutBlock::computeBlockPreferredLogicalWidths( 1469 void LayoutBlock::computeBlockPreferredLogicalWidths(
1470 LayoutUnit& minLogicalWidth, 1470 LayoutUnit& minLogicalWidth,
1471 LayoutUnit& maxLogicalWidth) const { 1471 LayoutUnit& maxLogicalWidth) const {
1472 const ComputedStyle& styleToUse = styleRef(); 1472 const ComputedStyle& styleToUse = styleRef();
1473 bool nowrap = styleToUse.whiteSpace() == NOWRAP; 1473 bool nowrap = styleToUse.whiteSpace() == EWhiteSpace::Nowrap;
1474 1474
1475 LayoutObject* child = firstChild(); 1475 LayoutObject* child = firstChild();
1476 LayoutBlock* containingBlock = this->containingBlock(); 1476 LayoutBlock* containingBlock = this->containingBlock();
1477 LayoutUnit floatLeftWidth, floatRightWidth; 1477 LayoutUnit floatLeftWidth, floatRightWidth;
1478 while (child) { 1478 while (child) {
1479 // Positioned children don't affect the min/max width. Spanners only affect 1479 // Positioned children don't affect the min/max width. Spanners only affect
1480 // the min/max width of the multicol container, not the flow thread. 1480 // the min/max width of the multicol container, not the flow thread.
1481 if (child->isOutOfFlowPositioned() || child->isColumnSpanAll()) { 1481 if (child->isOutOfFlowPositioned() || child->isColumnSpanAll()) {
1482 child = child->nextSibling(); 1482 child = child->nextSibling();
1483 continue; 1483 continue;
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
2207 } 2207 }
2208 2208
2209 return availableHeight; 2209 return availableHeight;
2210 } 2210 }
2211 2211
2212 bool LayoutBlock::hasDefiniteLogicalHeight() const { 2212 bool LayoutBlock::hasDefiniteLogicalHeight() const {
2213 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); 2213 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
2214 } 2214 }
2215 2215
2216 } // namespace blink 2216 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698