Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: Source/core/rendering/RenderText.cpp

Issue 23455024: Move ownership of the TextResourceDecoder to DecodedDataDocumentParser (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698