diff options
Diffstat (limited to 'WebCore/platform/text/TextEncoding.cpp')
| -rw-r--r-- | WebCore/platform/text/TextEncoding.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/platform/text/TextEncoding.cpp b/WebCore/platform/text/TextEncoding.cpp index c7676e9..9026049 100644 --- a/WebCore/platform/text/TextEncoding.cpp +++ b/WebCore/platform/text/TextEncoding.cpp @@ -59,15 +59,15 @@ TextEncoding::TextEncoding(const String& name) { } -String TextEncoding::decode(const char* data, size_t length) const +String TextEncoding::decode(const char* data, size_t length, bool stopOnError, bool& sawError) const { if (!m_name) return String(); - return TextDecoder(*this).decode(data, length, true); + return TextDecoder(*this).decode(data, length, true, stopOnError, sawError); } -CString TextEncoding::encode(const UChar* characters, size_t length, bool allowEntities) const +CString TextEncoding::encode(const UChar* characters, size_t length, UnencodableHandling handling) const { if (!m_name) return CString(); @@ -100,11 +100,11 @@ CString TextEncoding::encode(const UChar* characters, size_t length, bool allowE source = normalizedCharacters.data(); sourceLength = normalizedLength; } - return newTextCodec(*this)->encode(source, sourceLength, allowEntities); + return newTextCodec(*this)->encode(source, sourceLength, handling); #elif USE(QT4_UNICODE) QString str(reinterpret_cast<const QChar*>(characters), length); str = str.normalized(QString::NormalizationForm_C); - return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), allowEntities); + return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling); #endif } |