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.
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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 // layoutBlock(). | 390 // layoutBlock(). |
391 layoutBlock(false); | 391 layoutBlock(false); |
392 | 392 |
393 // It's safe to check for control clip here, since controls can never be table
cells. | 393 // It's safe to check for control clip here, since controls can never be table
cells. |
394 // If we have a lightweight clip, there can never be any overflow from childre
n. | 394 // If we have a lightweight clip, there can never be any overflow from childre
n. |
395 if (hasControlClip() && m_overflow) | 395 if (hasControlClip() && m_overflow) |
396 clearLayoutOverflow(); | 396 clearLayoutOverflow(); |
397 | 397 |
398 invalidateBackgroundObscurationStatus(); | 398 invalidateBackgroundObscurationStatus(); |
399 | 399 |
400 // If clamping is delayed, we will restore in PaintLayerScrollableArea::clampS
crollPositionsAfterLayout. | 400 // If clamping is delayed, we will restore in |
401 // Restoring during the intermediate layout may clamp the scroller to the wron
g bounds. | 401 // PaintLayerScrollableArea::clampScrollPositionsAfterLayout. |
402 bool clampingDelayed = PaintLayerScrollableArea:: | 402 // Restoring during the intermediate layout may clamp the scroller to the |
403 DelayScrollPositionClampScope::clampingIsDelayed(); | 403 // wrong bounds. |
| 404 bool clampingDelayed = PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 405 clampingIsDelayed(); |
404 if (needsScrollAnchoring && !clampingDelayed) | 406 if (needsScrollAnchoring && !clampingDelayed) |
405 getScrollableArea()->scrollAnchor()->restore(); | 407 getScrollableArea()->scrollAnchor()->restore(); |
406 | 408 |
407 m_heightAvailableToChildrenChanged = false; | 409 m_heightAvailableToChildrenChanged = false; |
408 } | 410 } |
409 | 411 |
410 bool LayoutBlock::widthAvailableToChildrenHasChanged() { | 412 bool LayoutBlock::widthAvailableToChildrenHasChanged() { |
411 // TODO(robhogan): Does m_widthAvailableToChildrenChanged always get reset whe
n it needs to? | 413 // TODO(robhogan): Does m_widthAvailableToChildrenChanged always get reset whe
n it needs to? |
412 bool widthAvailableToChildrenHasChanged = m_widthAvailableToChildrenChanged; | 414 bool widthAvailableToChildrenHasChanged = m_widthAvailableToChildrenChanged; |
413 m_widthAvailableToChildrenChanged = false; | 415 m_widthAvailableToChildrenChanged = false; |
(...skipping 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2135 } | 2137 } |
2136 | 2138 |
2137 return availableHeight; | 2139 return availableHeight; |
2138 } | 2140 } |
2139 | 2141 |
2140 bool LayoutBlock::hasDefiniteLogicalHeight() const { | 2142 bool LayoutBlock::hasDefiniteLogicalHeight() const { |
2141 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); | 2143 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); |
2142 } | 2144 } |
2143 | 2145 |
2144 } // namespace blink | 2146 } // namespace blink |
OLD | NEW |