X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=WebCore%2Floader%2FDecoder.cpp;h=d33b0b31d0f5389edb9cd6991e40bf832efeee47;hp=2b5944cd712856ca52d374de98b4a6ee2c83e08e;hb=c869f50eecb15949f82d6e5aa87d388207cfaa52;hpb=66c9cba8044d931e3d822c5d40f5d52e8dc4cdd4 diff --git a/WebCore/loader/Decoder.cpp b/WebCore/loader/Decoder.cpp index 2b5944cd7128..d33b0b31d0f5 100644 --- a/WebCore/loader/Decoder.cpp +++ b/WebCore/loader/Decoder.cpp @@ -25,6 +25,7 @@ #include "config.h" #include "Decoder.h" +#include "CString.h" #include "DOMImplementation.h" #include "HTMLNames.h" #include "StreamingTextDecoder.h" @@ -251,8 +252,8 @@ breakBreak: } Decoder::Decoder(const String& mimeType, const String& defaultEncodingName) - : m_encoding(defaultEncodingName.isNull() ? "iso8859-1" : defaultEncodingName.ascii().data()) - , m_encodingName(defaultEncodingName.isNull() ? "iso8859-1" : defaultEncodingName.ascii().data()) + : m_encoding(defaultEncodingName.isNull() ? "iso8859-1" : defaultEncodingName.latin1()) + , m_encodingName(defaultEncodingName.isNull() ? "iso8859-1" : defaultEncodingName.latin1()) , m_type(DefaultEncoding) , m_reachedBody(false) , m_checkedForCSSCharset(false)