| 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 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1126 // We are no longer stripping whitespace at the start of | 1126 // We are no longer stripping whitespace at the start of |
| 1127 // a line. | 1127 // a line. |
| 1128 if (!child->isFloating()) { | 1128 if (!child->isFloating()) { |
| 1129 stripFrontSpaces = false; | 1129 stripFrontSpaces = false; |
| 1130 trailingSpaceChild = 0; | 1130 trailingSpaceChild = 0; |
| 1131 } | 1131 } |
| 1132 } else if (child->isText()) { | 1132 } else if (child->isText()) { |
| 1133 // Case (3). Text. | 1133 // Case (3). Text. |
| 1134 RenderText* t = toRenderText(child); | 1134 RenderText* t = toRenderText(child); |
| 1135 | 1135 |
| 1136 if (t->style()->hasTextCombine() && t->isCombineText()) | |
| 1137 toRenderCombineText(t)->combineText(); | |
| 1138 | |
| 1139 // Determine if we have a breakable character. Pass in | 1136 // Determine if we have a breakable character. Pass in |
| 1140 // whether or not we should ignore any spaces at the front | 1137 // whether or not we should ignore any spaces at the front |
| 1141 // of the string. If those are going to be stripped out, | 1138 // of the string. If those are going to be stripped out, |
| 1142 // then they shouldn't be considered in the breakable char | 1139 // then they shouldn't be considered in the breakable char |
| 1143 // check. | 1140 // check. |
| 1144 bool hasBreakableChar, hasBreak; | 1141 bool hasBreakableChar, hasBreak; |
| 1145 float firstLineMinWidth, lastLineMinWidth; | 1142 float firstLineMinWidth, lastLineMinWidth; |
| 1146 bool hasBreakableStart, hasBreakableEnd; | 1143 bool hasBreakableStart, hasBreakableEnd; |
| 1147 float firstLineMaxWidth, lastLineMaxWidth; | 1144 float firstLineMaxWidth, lastLineMaxWidth; |
| 1148 t->trimmedPrefWidths(inlineMax, | 1145 t->trimmedPrefWidths(inlineMax, |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1637 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); | 1634 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
(); |
| 1638 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; | 1635 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
se) - logicalLeft; |
| 1639 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); | 1636 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); |
| 1640 | 1637 |
| 1641 if (!style()->isLeftToRightDirection()) | 1638 if (!style()->isLeftToRightDirection()) |
| 1642 return logicalWidth() - logicalLeft; | 1639 return logicalWidth() - logicalLeft; |
| 1643 return logicalLeft; | 1640 return logicalLeft; |
| 1644 } | 1641 } |
| 1645 | 1642 |
| 1646 } | 1643 } |
| OLD | NEW |