| 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 void LayoutBlock::addOverflowFromChildren() | 472 void LayoutBlock::addOverflowFromChildren() |
| 473 { | 473 { |
| 474 if (childrenInline()) | 474 if (childrenInline()) |
| 475 toLayoutBlockFlow(this)->addOverflowFromInlineChildren(); | 475 toLayoutBlockFlow(this)->addOverflowFromInlineChildren(); |
| 476 else | 476 else |
| 477 addOverflowFromBlockChildren(); | 477 addOverflowFromBlockChildren(); |
| 478 } | 478 } |
| 479 | 479 |
| 480 void LayoutBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool) | 480 void LayoutBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool) |
| 481 { | 481 { |
| 482 m_overflow.clear(); | 482 m_overflow.reset(); |
| 483 | 483 |
| 484 // Add overflow from children. | 484 // Add overflow from children. |
| 485 addOverflowFromChildren(); | 485 addOverflowFromChildren(); |
| 486 | 486 |
| 487 // Add in the overflow from positioned objects. | 487 // Add in the overflow from positioned objects. |
| 488 addOverflowFromPositionedObjects(); | 488 addOverflowFromPositionedObjects(); |
| 489 | 489 |
| 490 if (hasOverflowClip()) { | 490 if (hasOverflowClip()) { |
| 491 // When we have overflow clip, propagate the original spillout since it
will include collapsed bottom margins | 491 // When we have overflow clip, propagate the original spillout since it
will include collapsed bottom margins |
| 492 // and bottom padding. Set the axis we don't care about to be 1, since
we want this overflow to always | 492 // and bottom padding. Set the axis we don't care about to be 1, since
we want this overflow to always |
| (...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1913 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { | 1913 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { |
| 1914 LayoutBox* currBox = *it; | 1914 LayoutBox* currBox = *it; |
| 1915 ASSERT(!currBox->needsLayout()); | 1915 ASSERT(!currBox->needsLayout()); |
| 1916 } | 1916 } |
| 1917 } | 1917 } |
| 1918 } | 1918 } |
| 1919 | 1919 |
| 1920 #endif | 1920 #endif |
| 1921 | 1921 |
| 1922 } // namespace blink | 1922 } // namespace blink |
| OLD | NEW |