| OLD | NEW |
| 1 /* | 1 /* |
| 2 * (C) 1999 Lars Knoll (knoll@kde.org) | 2 * (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Dirk Mueller (mueller@kde.org) | 3 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
| 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
| 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1105 run.setXPos(leadWidth + currMaxWidth); | 1105 run.setXPos(leadWidth + currMaxWidth); |
| 1106 | 1106 |
| 1107 currMaxWidth += f.width(run); | 1107 currMaxWidth += f.width(run); |
| 1108 glyphOverflow.right = 0; | 1108 glyphOverflow.right = 0; |
| 1109 needsWordSpacing = isSpace && !previousCharacterIsSpace && i ==
len - 1; | 1109 needsWordSpacing = isSpace && !previousCharacterIsSpace && i ==
len - 1; |
| 1110 } | 1110 } |
| 1111 ASSERT(lastWordBoundary == i); | 1111 ASSERT(lastWordBoundary == i); |
| 1112 lastWordBoundary++; | 1112 lastWordBoundary++; |
| 1113 } | 1113 } |
| 1114 } | 1114 } |
| 1115 if (run) | |
| 1116 bidiRuns.deleteRuns(); | |
| 1117 | 1115 |
| 1118 if (firstGlyphLeftOverflow > 0) | 1116 if (firstGlyphLeftOverflow > 0) |
| 1119 glyphOverflow.left = firstGlyphLeftOverflow; | 1117 glyphOverflow.left = firstGlyphLeftOverflow; |
| 1120 | 1118 |
| 1121 if ((needsWordSpacing && len > 1) || (ignoringSpaces && !firstWord)) | 1119 if ((needsWordSpacing && len > 1) || (ignoringSpaces && !firstWord)) |
| 1122 currMaxWidth += wordSpacing; | 1120 currMaxWidth += wordSpacing; |
| 1123 | 1121 |
| 1124 m_minWidth = std::max(currMinWidth, m_minWidth); | 1122 m_minWidth = std::max(currMinWidth, m_minWidth); |
| 1125 m_maxWidth = std::max(currMaxWidth, m_maxWidth); | 1123 m_maxWidth = std::max(currMaxWidth, m_maxWidth); |
| 1126 | 1124 |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1872 } | 1870 } |
| 1873 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); | 1871 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); |
| 1874 } | 1872 } |
| 1875 | 1873 |
| 1876 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() | 1874 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() |
| 1877 { | 1875 { |
| 1878 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); | 1876 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); |
| 1879 } | 1877 } |
| 1880 | 1878 |
| 1881 } // namespace blink | 1879 } // namespace blink |
| OLD | NEW |