| OLD | NEW |
| 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 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1362 | 1362 |
| 1363 int LayoutBlock::columnGap() const { | 1363 int LayoutBlock::columnGap() const { |
| 1364 if (style()->hasNormalColumnGap()) { | 1364 if (style()->hasNormalColumnGap()) { |
| 1365 // "1em" is recommended as the normal gap setting. Matches <p> margins. | 1365 // "1em" is recommended as the normal gap setting. Matches <p> margins. |
| 1366 return style()->getFontDescription().computedPixelSize(); | 1366 return style()->getFontDescription().computedPixelSize(); |
| 1367 } | 1367 } |
| 1368 return static_cast<int>(style()->columnGap()); | 1368 return static_cast<int>(style()->columnGap()); |
| 1369 } | 1369 } |
| 1370 | 1370 |
| 1371 void LayoutBlock::scrollbarsChanged(bool horizontalScrollbarChanged, | 1371 void LayoutBlock::scrollbarsChanged(bool horizontalScrollbarChanged, |
| 1372 bool verticalScrollbarChanged) { | 1372 bool verticalScrollbarChanged, |
| 1373 ScrollbarChangeContext context) { |
| 1373 m_widthAvailableToChildrenChanged |= verticalScrollbarChanged; | 1374 m_widthAvailableToChildrenChanged |= verticalScrollbarChanged; |
| 1374 m_heightAvailableToChildrenChanged |= horizontalScrollbarChanged; | 1375 m_heightAvailableToChildrenChanged |= horizontalScrollbarChanged; |
| 1375 } | 1376 } |
| 1376 | 1377 |
| 1377 void LayoutBlock::computeIntrinsicLogicalWidths( | 1378 void LayoutBlock::computeIntrinsicLogicalWidths( |
| 1378 LayoutUnit& minLogicalWidth, | 1379 LayoutUnit& minLogicalWidth, |
| 1379 LayoutUnit& maxLogicalWidth) const { | 1380 LayoutUnit& maxLogicalWidth) const { |
| 1380 // Size-contained elements don't consider their contents for preferred sizing. | 1381 // Size-contained elements don't consider their contents for preferred sizing. |
| 1381 if (style()->containsSize()) | 1382 if (style()->containsSize()) |
| 1382 return; | 1383 return; |
| (...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2207 } | 2208 } |
| 2208 | 2209 |
| 2209 return availableHeight; | 2210 return availableHeight; |
| 2210 } | 2211 } |
| 2211 | 2212 |
| 2212 bool LayoutBlock::hasDefiniteLogicalHeight() const { | 2213 bool LayoutBlock::hasDefiniteLogicalHeight() const { |
| 2213 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); | 2214 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); |
| 2214 } | 2215 } |
| 2215 | 2216 |
| 2216 } // namespace blink | 2217 } // namespace blink |
| OLD | NEW |