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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 const ComputedStyle& newStyle = styleRef(); | 197 const ComputedStyle& newStyle = styleRef(); |
198 ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE; | 198 ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE; |
199 ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE; | 199 ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE; |
200 if (oldTransform != newStyle.textTransform() || oldSecurity != newStyle.text
Security()) | 200 if (oldTransform != newStyle.textTransform() || oldSecurity != newStyle.text
Security()) |
201 transformText(); | 201 transformText(); |
202 | 202 |
203 // This is an optimization that kicks off font load before layout. | 203 // This is an optimization that kicks off font load before layout. |
204 // In order to make it fast, we only check if the first character of the | 204 // In order to make it fast, we only check if the first character of the |
205 // text is included in the unicode ranges of the fonts. | 205 // text is included in the unicode ranges of the fonts. |
206 if (!text().containsOnlyWhitespace()) | 206 if (!text().containsOnlyWhitespace()) |
207 newStyle.font().willUseFontData(text().characterStartingAt(0)); | 207 newStyle.font().willUseFontData(text()); |
208 } | 208 } |
209 | 209 |
210 void LayoutText::removeAndDestroyTextBoxes() | 210 void LayoutText::removeAndDestroyTextBoxes() |
211 { | 211 { |
212 if (!documentBeingDestroyed()) { | 212 if (!documentBeingDestroyed()) { |
213 if (firstTextBox()) { | 213 if (firstTextBox()) { |
214 if (isBR()) { | 214 if (isBR()) { |
215 RootInlineBox* next = firstTextBox()->root().nextRootBox(); | 215 RootInlineBox* next = firstTextBox()->root().nextRootBox(); |
216 if (next) | 216 if (next) |
217 next->markDirty(); | 217 next->markDirty(); |
(...skipping 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1699 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { | 1699 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { |
1700 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in
validationReason); | 1700 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in
validationReason); |
1701 if (box->truncation() != cNoTruncation) { | 1701 if (box->truncation() != cNoTruncation) { |
1702 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) | 1702 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) |
1703 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(
*ellipsisBox, invalidationReason); | 1703 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(
*ellipsisBox, invalidationReason); |
1704 } | 1704 } |
1705 } | 1705 } |
1706 } | 1706 } |
1707 | 1707 |
1708 } // namespace blink | 1708 } // namespace blink |
OLD | NEW |