| 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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 // children. | 410 // children. |
| 411 if (hasControlClip() && m_overflow) | 411 if (hasControlClip() && m_overflow) |
| 412 clearLayoutOverflow(); | 412 clearLayoutOverflow(); |
| 413 | 413 |
| 414 invalidateBackgroundObscurationStatus(); | 414 invalidateBackgroundObscurationStatus(); |
| 415 | 415 |
| 416 // If clamping is delayed, we will restore in | 416 // If clamping is delayed, we will restore in |
| 417 // PaintLayerScrollableArea::clampScrollPositionsAfterLayout. | 417 // PaintLayerScrollableArea::clampScrollPositionsAfterLayout. |
| 418 // Restoring during the intermediate layout may clamp the scroller to the | 418 // Restoring during the intermediate layout may clamp the scroller to the |
| 419 // wrong bounds. | 419 // wrong bounds. |
| 420 bool clampingDelayed = PaintLayerScrollableArea:: | 420 bool clampingDelayed = PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 421 DelayScrollPositionClampScope::clampingIsDelayed(); | 421 clampingIsDelayed(); |
| 422 if (needsScrollAnchoring && !clampingDelayed) | 422 if (needsScrollAnchoring && !clampingDelayed) |
| 423 getScrollableArea()->scrollAnchor()->restore(); | 423 getScrollableArea()->scrollAnchor()->restore(); |
| 424 | 424 |
| 425 m_heightAvailableToChildrenChanged = false; | 425 m_heightAvailableToChildrenChanged = false; |
| 426 } | 426 } |
| 427 | 427 |
| 428 bool LayoutBlock::widthAvailableToChildrenHasChanged() { | 428 bool LayoutBlock::widthAvailableToChildrenHasChanged() { |
| 429 // TODO(robhogan): Does m_widthAvailableToChildrenChanged always get reset | 429 // TODO(robhogan): Does m_widthAvailableToChildrenChanged always get reset |
| 430 // when it needs to? | 430 // when it needs to? |
| 431 bool widthAvailableToChildrenHasChanged = m_widthAvailableToChildrenChanged; | 431 bool widthAvailableToChildrenHasChanged = m_widthAvailableToChildrenChanged; |
| (...skipping 1775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |