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 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1688 break; | 1688 break; |
1689 } | 1689 } |
1690 // Check if a new float has been inserted after the last known float. | 1690 // Check if a new float has been inserted after the last known float. |
1691 if (!curr && floatIndex < layoutState.floats().size()) | 1691 if (!curr && floatIndex < layoutState.floats().size()) |
1692 layoutState.markForFullLayout(); | 1692 layoutState.markForFullLayout(); |
1693 } | 1693 } |
1694 | 1694 |
1695 if (layoutState.isFullLayout()) { | 1695 if (layoutState.isFullLayout()) { |
1696 // If we encountered a new float and have inline children, mark ourself to force us to issue paint invalidations. | 1696 // If we encountered a new float and have inline children, mark ourself to force us to issue paint invalidations. |
1697 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { | 1697 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { |
1698 setNeedsLayoutAndFullPaintInvalidation(MarkOnlyThis); | 1698 setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::Unk nown, MarkOnlyThis); |
esprehn
2015/03/23 20:19:43
This is from inside an already running layout
pdr.
2015/03/24 03:56:18
This should be okay. We have a similar situation w
| |
1699 setShouldDoFullPaintInvalidation(); | 1699 setShouldDoFullPaintInvalidation(); |
1700 } | 1700 } |
1701 | 1701 |
1702 // FIXME: This should just call deleteLineBoxTree, but that causes | 1702 // FIXME: This should just call deleteLineBoxTree, but that causes |
1703 // crashes for fast/repaint tests. | 1703 // crashes for fast/repaint tests. |
1704 curr = firstRootBox(); | 1704 curr = firstRootBox(); |
1705 while (curr) { | 1705 while (curr) { |
1706 // Note: This uses nextRootBox() insted of nextLineBox() like delete LineBoxTree does. | 1706 // Note: This uses nextRootBox() insted of nextLineBox() like delete LineBoxTree does. |
1707 RootInlineBox* next = curr->nextRootBox(); | 1707 RootInlineBox* next = curr->nextRootBox(); |
1708 curr->deleteLine(); | 1708 curr->deleteLine(); |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2052 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat (); | 2052 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat (); |
2053 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft; | 2053 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft; |
2054 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); | 2054 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); |
2055 | 2055 |
2056 if (!style()->isLeftToRightDirection()) | 2056 if (!style()->isLeftToRightDirection()) |
2057 return logicalWidth() - logicalLeft; | 2057 return logicalWidth() - logicalLeft; |
2058 return logicalLeft; | 2058 return logicalLeft; |
2059 } | 2059 } |
2060 | 2060 |
2061 } | 2061 } |
OLD | NEW |