| 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 // We must compute child's width and height, but not update them now. | 691 // We must compute child's width and height, but not update them now. |
| 692 // The child will update its width and height when it gets laid out, and needs | 692 // The child will update its width and height when it gets laid out, and needs |
| 693 // to see them change there. | 693 // to see them change there. |
| 694 LayoutBox* box = toLayoutBox(child); | 694 LayoutBox* box = toLayoutBox(child); |
| 695 if (hasStaticInlinePosition) { | 695 if (hasStaticInlinePosition) { |
| 696 LogicalExtentComputedValues computedValues; | 696 LogicalExtentComputedValues computedValues; |
| 697 box->computeLogicalWidth(computedValues); | 697 box->computeLogicalWidth(computedValues); |
| 698 LayoutUnit newLeft = computedValues.m_position; | 698 LayoutUnit newLeft = computedValues.m_position; |
| 699 if (newLeft != box->logicalLeft()) | 699 if (newLeft != box->logicalLeft()) |
| 700 layoutScope.setChildNeedsLayout(child); | 700 layoutScope.setChildNeedsLayout(child); |
| 701 } else if (hasStaticBlockPosition) { | 701 } |
| 702 if (hasStaticBlockPosition) { |
| 702 LogicalExtentComputedValues computedValues; | 703 LogicalExtentComputedValues computedValues; |
| 703 box->computeLogicalHeight(computedValues); | 704 box->computeLogicalHeight(computedValues); |
| 704 LayoutUnit newTop = computedValues.m_position; | 705 LayoutUnit newTop = computedValues.m_position; |
| 705 if (newTop != box->logicalTop()) | 706 if (newTop != box->logicalTop()) |
| 706 layoutScope.setChildNeedsLayout(child); | 707 layoutScope.setChildNeedsLayout(child); |
| 707 } | 708 } |
| 708 } | 709 } |
| 709 | 710 |
| 710 LayoutUnit LayoutBlock::marginIntrinsicLogicalWidthForChild( | 711 LayoutUnit LayoutBlock::marginIntrinsicLogicalWidthForChild( |
| 711 const LayoutBox& child) const { | 712 const LayoutBox& child) const { |
| (...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2205 } | 2206 } |
| 2206 | 2207 |
| 2207 return availableHeight; | 2208 return availableHeight; |
| 2208 } | 2209 } |
| 2209 | 2210 |
| 2210 bool LayoutBlock::hasDefiniteLogicalHeight() const { | 2211 bool LayoutBlock::hasDefiniteLogicalHeight() const { |
| 2211 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); | 2212 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); |
| 2212 } | 2213 } |
| 2213 | 2214 |
| 2214 } // namespace blink | 2215 } // namespace blink |
| OLD | NEW |