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 1813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1824 break; | 1824 break; |
1825 } | 1825 } |
1826 // Check if a new float has been inserted after the last known float. | 1826 // Check if a new float has been inserted after the last known float. |
1827 if (!curr && floatIndex < layoutState.floats().size()) | 1827 if (!curr && floatIndex < layoutState.floats().size()) |
1828 layoutState.markForFullLayout(); | 1828 layoutState.markForFullLayout(); |
1829 } | 1829 } |
1830 | 1830 |
1831 if (layoutState.isFullLayout()) { | 1831 if (layoutState.isFullLayout()) { |
1832 // If we encountered a new float and have inline children, mark ourself
to force us to repaint. | 1832 // If we encountered a new float and have inline children, mark ourself
to force us to repaint. |
1833 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { | 1833 if (layoutState.hasInlineChild() && !selfNeedsLayout()) { |
1834 setNeedsLayout(MarkOnlyThis); | 1834 setNeedsLayoutAndFullRepaint(MarkOnlyThis); |
1835 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 1835 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
1836 setShouldDoFullRepaintAfterLayout(true); | 1836 setShouldDoFullRepaintAfterLayout(true); |
1837 } | 1837 } |
1838 | 1838 |
1839 // FIXME: This should just call deleteLineBoxTree, but that causes | 1839 // FIXME: This should just call deleteLineBoxTree, but that causes |
1840 // crashes for fast/repaint tests. | 1840 // crashes for fast/repaint tests. |
1841 curr = firstRootBox(); | 1841 curr = firstRootBox(); |
1842 while (curr) { | 1842 while (curr) { |
1843 // Note: This uses nextRootBox() insted of nextLineBox() like delete
LineBoxTree does. | 1843 // Note: This uses nextRootBox() insted of nextLineBox() like delete
LineBoxTree does. |
1844 RootInlineBox* next = curr->nextRootBox(); | 1844 RootInlineBox* next = curr->nextRootBox(); |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2193 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); | 2193 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); |
2194 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; | 2194 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; |
2195 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); | 2195 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); |
2196 | 2196 |
2197 if (!style()->isLeftToRightDirection()) | 2197 if (!style()->isLeftToRightDirection()) |
2198 return logicalWidth() - logicalLeft; | 2198 return logicalWidth() - logicalLeft; |
2199 return logicalLeft; | 2199 return logicalLeft; |
2200 } | 2200 } |
2201 | 2201 |
2202 } | 2202 } |
OLD | NEW |