summaryrefslogtreecommitdiffstats
path: root/webkit/glue/dom_serializer.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 05:00:45 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 05:00:45 +0000
commit3afb9d38ba9ea2fd44fe44a026fdec1396188637 (patch)
treed96d28140c7f2227eac2cae0ff0027504bcbf958 /webkit/glue/dom_serializer.cc
parentb504899244b4264994d4daae2bee660706dba652 (diff)
downloadchromium_src-3afb9d38ba9ea2fd44fe44a026fdec1396188637.zip
chromium_src-3afb9d38ba9ea2fd44fe44a026fdec1396188637.tar.gz
chromium_src-3afb9d38ba9ea2fd44fe44a026fdec1396188637.tar.bz2
Don't assume WebCore::UChar is equivalent to wchar_t, and don't assume '\\' is a valid file path separator.
Review URL: http://codereview.chromium.org/9489 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_serializer.cc')
-rw-r--r--webkit/glue/dom_serializer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc
index dd415a5..ca2c775 100644
--- a/webkit/glue/dom_serializer.cc
+++ b/webkit/glue/dom_serializer.cc
@@ -227,8 +227,8 @@ WebCore::String DomSerializer::PreActionBeforeSerializeOpenTag(
xml_encoding = WebCore::UTF8Encoding().name();
std::wstring str_xml_declaration =
StringPrintf(kXMLDeclaration,
- param->doc->xmlVersion().charactersWithNullTermination(),
- xml_encoding.charactersWithNullTermination(),
+ StringToStdWString(param->doc->xmlVersion()).c_str(),
+ StringToStdWString(xml_encoding).c_str(),
param->doc->xmlStandalone() ? L" standalone=\"yes\"" :
L"");
result += StdWStringToString(str_xml_declaration);