Index: Source/core/dom/Document.cpp |
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp |
index 2a4a412ec22528fa4e3280dfea6a55815e2fdae9..550aaf37db67d0e51336e5435a0ca09779ce9616 100644 |
--- a/Source/core/dom/Document.cpp |
+++ b/Source/core/dom/Document.cpp |
@@ -1107,7 +1107,7 @@ void Document::setCharset(const String& charset) |
if (!encoding.isValid()) |
return; |
DocumentEncodingData newEncodingData = m_encodingData; |
- newEncodingData.encoding = encoding; |
+ newEncodingData.setEncoding(encoding); |
setEncodingData(newEncodingData); |
} |
@@ -3975,13 +3975,13 @@ void Document::setEncodingData(const DocumentEncodingData& newData) |
// document's title so that the user doesn't see an incorrectly decoded title |
// in the title bar. |
if (m_titleElement |
- && encoding() != newData.encoding |
+ && encoding() != newData.encoding() |
&& !m_titleElement->firstElementChild() |
&& encoding() == Latin1Encoding() |
&& m_titleElement->textContent().containsOnlyLatin1()) { |
CString originalBytes = m_titleElement->textContent().latin1(); |
- OwnPtr<TextCodec> codec = newTextCodec(newData.encoding); |
+ OwnPtr<TextCodec> codec = newTextCodec(newData.encoding()); |
String correctlyDecodedTitle = codec->decode(originalBytes.data(), originalBytes.length(), true); |
m_titleElement->setTextContent(correctlyDecodedTitle, IGNORE_EXCEPTION); |
} |