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 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1403 if (lastTypedCharacterOffsetToReveal >= 0) { | 1403 if (lastTypedCharacterOffsetToReveal >= 0) { |
1404 m_text.replace(lastTypedCharacterOffsetToReveal, 1, String(&revealedText , 1)); | 1404 m_text.replace(lastTypedCharacterOffsetToReveal, 1, String(&revealedText , 1)); |
1405 // m_text may be updated later before timer fires. We invalidate the las tTypedCharacterOffset to avoid inconsistency. | 1405 // m_text may be updated later before timer fires. We invalidate the las tTypedCharacterOffset to avoid inconsistency. |
1406 secureTextTimer->invalidate(); | 1406 secureTextTimer->invalidate(); |
1407 } | 1407 } |
1408 } | 1408 } |
1409 | 1409 |
1410 void RenderText::setText(PassRefPtr<StringImpl> text, bool force) | 1410 void RenderText::setText(PassRefPtr<StringImpl> text, bool force) |
1411 { | 1411 { |
1412 ASSERT(text); | 1412 ASSERT(text); |
1413 | |
Julien - ping for review
2014/10/17 16:49:59
Unrelated change.
dsinclair
2014/10/17 17:21:39
Done.
| |
1414 if (!force && equal(m_text.impl(), text.get())) | 1413 if (!force && equal(m_text.impl(), text.get())) |
1415 return; | 1414 return; |
1416 | 1415 |
1417 setTextInternal(text); | 1416 setTextInternal(text); |
1418 // If preferredLogicalWidthsDirty() of an orphan child is true, RenderObject ChildList:: | 1417 // If preferredLogicalWidthsDirty() of an orphan child is true, RenderObject ChildList:: |
1419 // insertChildNode() fails to set true to owner. To avoid that, we call | 1418 // insertChildNode() fails to set true to owner. To avoid that, we call |
1420 // setNeedsLayoutAndPrefWidthsRecalc() only if this RenderText has parent. | 1419 // setNeedsLayoutAndPrefWidthsRecalc() only if this RenderText has parent. |
1421 if (parent()) | 1420 if (parent()) |
1422 setNeedsLayoutAndPrefWidthsRecalc(); | 1421 setNeedsLayoutAndPrefWidthsRecalc(); |
1423 m_knownToHaveNoOverflowAndNoFallbackFonts = false; | 1422 m_knownToHaveNoOverflowAndNoFallbackFonts = false; |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1863 } | 1862 } |
1864 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); | 1863 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); |
1865 } | 1864 } |
1866 | 1865 |
1867 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() | 1866 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() |
1868 { | 1867 { |
1869 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); | 1868 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); |
1870 } | 1869 } |
1871 | 1870 |
1872 } // namespace blink | 1871 } // namespace blink |
OLD | NEW |