| 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 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 if (lineBox) { | 785 if (lineBox) { |
| 786 lineBox->setLineBreakInfo(endOfLine.object(), endOfLine.offset()
, resolver.status()); | 786 lineBox->setLineBreakInfo(endOfLine.object(), endOfLine.offset()
, resolver.status()); |
| 787 if (layoutState.usesPaintInvalidationBounds()) | 787 if (layoutState.usesPaintInvalidationBounds()) |
| 788 layoutState.updatePaintInvalidationRangeFromBox(lineBox); | 788 layoutState.updatePaintInvalidationRangeFromBox(lineBox); |
| 789 } | 789 } |
| 790 } | 790 } |
| 791 | 791 |
| 792 for (size_t i = 0; i < lineBreaker.positionedObjects().size(); ++i) | 792 for (size_t i = 0; i < lineBreaker.positionedObjects().size(); ++i) |
| 793 setStaticPositions(this, lineBreaker.positionedObjects()[i]); | 793 setStaticPositions(this, lineBreaker.positionedObjects()[i]); |
| 794 | 794 |
| 795 if (!layoutState.lineInfo().isEmpty()) { | 795 if (!layoutState.lineInfo().isEmpty()) |
| 796 layoutState.lineInfo().setFirstLine(false); | 796 layoutState.lineInfo().setFirstLine(false); |
| 797 clearFloats(lineBreaker.clear()); | |
| 798 } | |
| 799 | 797 |
| 800 lineMidpointState.reset(); | 798 lineMidpointState.reset(); |
| 801 resolver.setPosition(endOfLine, numberOfIsolateAncestors(endOfLine)); | 799 resolver.setPosition(endOfLine, numberOfIsolateAncestors(endOfLine)); |
| 802 } | 800 } |
| 803 } | 801 } |
| 804 | 802 |
| 805 void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) | 803 void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) |
| 806 { | 804 { |
| 807 if (layoutState.endLine()) { | 805 if (layoutState.endLine()) { |
| 808 if (layoutState.endLineMatched()) { | 806 if (layoutState.endLineMatched()) { |
| (...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1630 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); | 1628 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); |
| 1631 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; | 1629 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; |
| 1632 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); | 1630 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); |
| 1633 | 1631 |
| 1634 if (!style()->isLeftToRightDirection()) | 1632 if (!style()->isLeftToRightDirection()) |
| 1635 return logicalWidth() - logicalLeft; | 1633 return logicalWidth() - logicalLeft; |
| 1636 return logicalLeft; | 1634 return logicalLeft; |
| 1637 } | 1635 } |
| 1638 | 1636 |
| 1639 } | 1637 } |
| OLD | NEW |