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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 { | 186 { |
187 return false; | 187 return false; |
188 } | 188 } |
189 | 189 |
190 void RenderText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl
e) | 190 void RenderText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl
e) |
191 { | 191 { |
192 // There is no need to ever schedule repaints from a style change of a text
run, since | 192 // There is no need to ever schedule repaints from a style change of a text
run, since |
193 // we already did this for the parent of the text run. | 193 // we already did this for the parent of the text run. |
194 // We do have to schedule layouts, though, since a style change can force us
to | 194 // We do have to schedule layouts, though, since a style change can force us
to |
195 // need to relayout. | 195 // need to relayout. |
196 if (diff == StyleDifferenceLayout) { | 196 if (diff.needsFullLayout()) { |
197 setNeedsLayoutAndPrefWidthsRecalc(); | 197 setNeedsLayoutAndPrefWidthsRecalc(); |
198 m_knownToHaveNoOverflowAndNoFallbackFonts = false; | 198 m_knownToHaveNoOverflowAndNoFallbackFonts = false; |
199 } | 199 } |
200 | 200 |
201 RenderStyle* newStyle = style(); | 201 RenderStyle* newStyle = style(); |
202 ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE; | 202 ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE; |
203 ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE; | 203 ETextSecurity oldSecurity = oldStyle ? oldStyle->textSecurity() : TSNONE; |
204 if (oldTransform != newStyle->textTransform() || oldSecurity != newStyle->te
xtSecurity()) | 204 if (oldTransform != newStyle->textTransform() || oldSecurity != newStyle->te
xtSecurity()) |
205 transformText(); | 205 transformText(); |
206 | 206 |
(...skipping 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1884 } | 1884 } |
1885 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); | 1885 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); |
1886 } | 1886 } |
1887 | 1887 |
1888 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() | 1888 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() |
1889 { | 1889 { |
1890 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); | 1890 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); |
1891 } | 1891 } |
1892 | 1892 |
1893 } // namespace WebCore | 1893 } // namespace WebCore |
OLD | NEW |