| Index: Source/core/rendering/RenderText.cpp
|
| diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp
|
| index d07019067faf3103e4d2c879c4f6d2509f86e222..5d3a4e47054527181f8f145e42076898cf8c9c10 100644
|
| --- a/Source/core/rendering/RenderText.cpp
|
| +++ b/Source/core/rendering/RenderText.cpp
|
| @@ -186,7 +186,7 @@ bool RenderText::isWordBreak() const
|
|
|
| void RenderText::updateNeedsTranscoding()
|
| {
|
| - const WTF::TextEncoding* encoding = document()->decoder() ? &document()->decoder()->encoding() : 0;
|
| + const WTF::TextEncoding* encoding = document()->encoding().isValid() ? &document()->encoding() : 0;
|
| m_needsTranscoding = fontTranscoder().needsTranscoding(style()->font().fontDescription(), encoding);
|
| }
|
|
|
| @@ -1329,7 +1329,7 @@ void RenderText::setTextInternal(PassRefPtr<StringImpl> text)
|
| ASSERT(text);
|
| m_text = text;
|
| if (m_needsTranscoding) {
|
| - const WTF::TextEncoding* encoding = document()->decoder() ? &document()->decoder()->encoding() : 0;
|
| + const WTF::TextEncoding* encoding = document()->encoding().isValid() ? &document()->encoding() : 0;
|
| fontTranscoder().convert(m_text, style()->font().fontDescription(), encoding);
|
| }
|
| ASSERT(m_text);
|
|
|