From c869f50eecb15949f82d6e5aa87d388207cfaa52 Mon Sep 17 00:00:00 2001 From: ap Date: Fri, 1 Sep 2006 19:48:28 +0000 Subject: [PATCH] Build fix. * loader/Decoder.cpp: (Decoder::Decoder): Use String::latin1(). git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16176 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 7 +++++++ WebCore/loader/Decoder.cpp | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 1921c3fa960f..22aae86de72e 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,10 @@ +2006-09-01 Alexey Proskuryakov + + Release build fix. + + * loader/Decoder.cpp: + (Decoder::Decoder): Use String::latin1(). + 2006-09-01 Alexey Proskuryakov Reviewed by Eric. 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) -- 2.36.0