OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
4 * All right reserved. | 4 * All right reserved. |
5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1668 childMaxPreferredLogicalWidth); | 1668 childMaxPreferredLogicalWidth); |
1669 childMin += childMinPreferredLogicalWidth; | 1669 childMin += childMinPreferredLogicalWidth; |
1670 childMax += childMaxPreferredLogicalWidth; | 1670 childMax += childMaxPreferredLogicalWidth; |
1671 | 1671 |
1672 bool clearPreviousFloat; | 1672 bool clearPreviousFloat; |
1673 if (child->isFloating()) { | 1673 if (child->isFloating()) { |
1674 const ComputedStyle& childStyle = child->styleRef(); | 1674 const ComputedStyle& childStyle = child->styleRef(); |
1675 clearPreviousFloat = | 1675 clearPreviousFloat = |
1676 (prevFloat && | 1676 (prevFloat && |
1677 ((prevFloat->styleRef().floating() == EFloat::kLeft && | 1677 ((prevFloat->styleRef().floating() == EFloat::kLeft && |
1678 (childStyle.clear() & ClearLeft)) || | 1678 (childStyle.clear() == ClearBoth || |
| 1679 childStyle.clear() == ClearLeft)) || |
1679 (prevFloat->styleRef().floating() == EFloat::kRight && | 1680 (prevFloat->styleRef().floating() == EFloat::kRight && |
1680 (childStyle.clear() & ClearRight)))); | 1681 (childStyle.clear() == ClearBoth || |
| 1682 childStyle.clear() == ClearRight)))); |
1681 prevFloat = child; | 1683 prevFloat = child; |
1682 } else { | 1684 } else { |
1683 clearPreviousFloat = false; | 1685 clearPreviousFloat = false; |
1684 } | 1686 } |
1685 | 1687 |
1686 bool canBreakReplacedElement = !child->isImage() || allowImagesToBreak; | 1688 bool canBreakReplacedElement = !child->isImage() || allowImagesToBreak; |
1687 if ((canBreakReplacedElement && (autoWrap || oldAutoWrap) && | 1689 if ((canBreakReplacedElement && (autoWrap || oldAutoWrap) && |
1688 (!isPrevChildInlineFlow || shouldBreakLineAfterText)) || | 1690 (!isPrevChildInlineFlow || shouldBreakLineAfterText)) || |
1689 clearPreviousFloat) { | 1691 clearPreviousFloat) { |
1690 minLogicalWidth = std::max(minLogicalWidth, inlineMin); | 1692 minLogicalWidth = std::max(minLogicalWidth, inlineMin); |
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2513 | 2515 |
2514 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { | 2516 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { |
2515 // LayoutBlockFlow is in charge of paint invalidation of the first line. | 2517 // LayoutBlockFlow is in charge of paint invalidation of the first line. |
2516 if (firstLineBox()) | 2518 if (firstLineBox()) |
2517 return false; | 2519 return false; |
2518 | 2520 |
2519 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); | 2521 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); |
2520 } | 2522 } |
2521 | 2523 |
2522 } // namespace blink | 2524 } // namespace blink |
OLD | NEW |