| 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 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 984 DCHECK(positioned_descendants); | 984 DCHECK(positioned_descendants); |
| 985 DCHECK(positioned_descendants->Contains(o)); | 985 DCHECK(positioned_descendants->Contains(o)); |
| 986 positioned_descendants->erase(o); | 986 positioned_descendants->erase(o); |
| 987 if (positioned_descendants->IsEmpty()) { | 987 if (positioned_descendants->IsEmpty()) { |
| 988 g_positioned_descendants_map->erase(container); | 988 g_positioned_descendants_map->erase(container); |
| 989 container->has_positioned_objects_ = false; | 989 container->has_positioned_objects_ = false; |
| 990 } | 990 } |
| 991 } | 991 } |
| 992 | 992 |
| 993 PaintInvalidationReason LayoutBlock::InvalidatePaint( | 993 PaintInvalidationReason LayoutBlock::InvalidatePaint( |
| 994 const PaintInvalidationState& paint_invalidation_state) { | |
| 995 return LayoutBox::InvalidatePaint(paint_invalidation_state); | |
| 996 } | |
| 997 | |
| 998 PaintInvalidationReason LayoutBlock::InvalidatePaint( | |
| 999 const PaintInvalidatorContext& context) const { | 994 const PaintInvalidatorContext& context) const { |
| 1000 return BlockPaintInvalidator(*this).InvalidatePaint(context); | 995 return BlockPaintInvalidator(*this).InvalidatePaint(context); |
| 1001 } | 996 } |
| 1002 | 997 |
| 1003 void LayoutBlock::ClearPreviousVisualRects() { | 998 void LayoutBlock::ClearPreviousVisualRects() { |
| 1004 LayoutBox::ClearPreviousVisualRects(); | 999 LayoutBox::ClearPreviousVisualRects(); |
| 1005 BlockPaintInvalidator(*this).ClearPreviousVisualRects(); | 1000 BlockPaintInvalidator(*this).ClearPreviousVisualRects(); |
| 1006 } | 1001 } |
| 1007 | 1002 |
| 1008 void LayoutBlock::RemovePositionedObjects( | 1003 void LayoutBlock::RemovePositionedObjects( |
| (...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2200 bool LayoutBlock::HasDefiniteLogicalHeight() const { | 2195 bool LayoutBlock::HasDefiniteLogicalHeight() const { |
| 2201 return AvailableLogicalHeightForPercentageComputation() != LayoutUnit(-1); | 2196 return AvailableLogicalHeightForPercentageComputation() != LayoutUnit(-1); |
| 2202 } | 2197 } |
| 2203 | 2198 |
| 2204 bool LayoutBlock::NeedsPreferredWidthsRecalculation() const { | 2199 bool LayoutBlock::NeedsPreferredWidthsRecalculation() const { |
| 2205 return (HasRelativeLogicalHeight() && Style()->LogicalWidth().IsAuto()) || | 2200 return (HasRelativeLogicalHeight() && Style()->LogicalWidth().IsAuto()) || |
| 2206 LayoutBox::NeedsPreferredWidthsRecalculation(); | 2201 LayoutBox::NeedsPreferredWidthsRecalculation(); |
| 2207 } | 2202 } |
| 2208 | 2203 |
| 2209 } // namespace blink | 2204 } // namespace blink |
| OLD | NEW |