| 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 357 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
| 358 // we overflow or not. | 358 // we overflow or not. |
| 359 if (hasOverflowClip()) | 359 if (hasOverflowClip()) |
| 360 layer()->getScrollableArea()->updateAfterLayout(); | 360 layer()->getScrollableArea()->updateAfterLayout(); |
| 361 } | 361 } |
| 362 | 362 |
| 363 void LayoutBlock::layout() | 363 void LayoutBlock::layout() |
| 364 { | 364 { |
| 365 LayoutAnalyzer::Scope analyzer(*this); | 365 LayoutAnalyzer::Scope analyzer(*this); |
| 366 | 366 |
| 367 bool needsScrollAnchoring = RuntimeEnabledFeatures::scrollAnchoringEnabled()
&& hasOverflowClip(); | 367 bool needsScrollAnchoring = hasOverflowClip() |
| 368 && getScrollableArea()->shouldPerformScrollAnchoring(); |
| 368 if (needsScrollAnchoring) | 369 if (needsScrollAnchoring) |
| 369 getScrollableArea()->scrollAnchor().save(); | 370 getScrollableArea()->scrollAnchor().save(); |
| 370 | 371 |
| 371 // Table cells call layoutBlock directly, so don't add any logic here. Put
code into | 372 // Table cells call layoutBlock directly, so don't add any logic here. Put
code into |
| 372 // layoutBlock(). | 373 // layoutBlock(). |
| 373 layoutBlock(false); | 374 layoutBlock(false); |
| 374 | 375 |
| 375 // It's safe to check for control clip here, since controls can never be tab
le cells. | 376 // It's safe to check for control clip here, since controls can never be tab
le cells. |
| 376 // If we have a lightweight clip, there can never be any overflow from child
ren. | 377 // If we have a lightweight clip, there can never be any overflow from child
ren. |
| 377 if (hasControlClip() && m_overflow) | 378 if (hasControlClip() && m_overflow) |
| (...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1866 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { | 1867 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { |
| 1867 LayoutBox* currBox = *it; | 1868 LayoutBox* currBox = *it; |
| 1868 ASSERT(!currBox->needsLayout()); | 1869 ASSERT(!currBox->needsLayout()); |
| 1869 } | 1870 } |
| 1870 } | 1871 } |
| 1871 } | 1872 } |
| 1872 | 1873 |
| 1873 #endif | 1874 #endif |
| 1874 | 1875 |
| 1875 } // namespace blink | 1876 } // namespace blink |
| OLD | NEW |