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. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1692 break; | 1692 break; |
1693 } | 1693 } |
1694 // Check if a new float has been inserted after the last known float. | 1694 // Check if a new float has been inserted after the last known float. |
1695 if (!curr && floatIndex < layoutState.floats().size()) | 1695 if (!curr && floatIndex < layoutState.floats().size()) |
1696 layoutState.markForFullLayout(); | 1696 layoutState.markForFullLayout(); |
1697 } | 1697 } |
1698 | 1698 |
1699 if (layoutState.isFullLayout()) { | 1699 if (layoutState.isFullLayout()) { |
1700 // If we encountered a new float and have inline children, mark ourself
to force us to issue paint invalidations. | 1700 // If we encountered a new float and have inline children, mark ourself
to force us to issue paint invalidations. |
1701 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { | 1701 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { |
1702 setNeedsLayoutAndFullPaintInvalidation(MarkOnlyThis); | 1702 setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::Flo
atDescendantChanged, MarkOnlyThis); |
1703 setShouldDoFullPaintInvalidation(); | 1703 setShouldDoFullPaintInvalidation(); |
1704 } | 1704 } |
1705 | 1705 |
1706 // FIXME: This should just call deleteLineBoxTree, but that causes | 1706 // FIXME: This should just call deleteLineBoxTree, but that causes |
1707 // crashes for fast/repaint tests. | 1707 // crashes for fast/repaint tests. |
1708 curr = firstRootBox(); | 1708 curr = firstRootBox(); |
1709 while (curr) { | 1709 while (curr) { |
1710 // Note: This uses nextRootBox() insted of nextLineBox() like delete
LineBoxTree does. | 1710 // Note: This uses nextRootBox() insted of nextLineBox() like delete
LineBoxTree does. |
1711 RootInlineBox* next = curr->nextRootBox(); | 1711 RootInlineBox* next = curr->nextRootBox(); |
1712 curr->deleteLine(); | 1712 curr->deleteLine(); |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2056 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); | 2056 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); |
2057 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; | 2057 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; |
2058 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); | 2058 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); |
2059 | 2059 |
2060 if (!style()->isLeftToRightDirection()) | 2060 if (!style()->isLeftToRightDirection()) |
2061 return logicalWidth() - logicalLeft; | 2061 return logicalWidth() - logicalLeft; |
2062 return logicalLeft; | 2062 return logicalLeft; |
2063 } | 2063 } |
2064 | 2064 |
2065 } | 2065 } |
OLD | NEW |