summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 17:48:24 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 17:48:24 +0000
commitc910d1dd8294e54132d316c6b21cb5447738dc08 (patch)
treee75bb27af372029ddfec7c9f0b1517d65dc4bb9b /webkit/port
parentccdb2200d1c9cc0baab6043317958b94cdbae26c (diff)
downloadchromium_src-c910d1dd8294e54132d316c6b21cb5447738dc08.zip
chromium_src-c910d1dd8294e54132d316c6b21cb5447738dc08.tar.gz
chromium_src-c910d1dd8294e54132d316c6b21cb5447738dc08.tar.bz2
Add GKURL.cpp, adjust a couple lingering wchar_ts to UTF16Chars
Review URL: http://codereview.chromium.org/6310 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/platform/GKURL.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/port/platform/GKURL.cpp b/webkit/port/platform/GKURL.cpp
index f809109..21ceb70 100644
--- a/webkit/port/platform/GKURL.cpp
+++ b/webkit/port/platform/GKURL.cpp
@@ -463,7 +463,7 @@ void KURL::setPort(unsigned short i)
if (i > 0) {
portStr = String::number(static_cast<int>(i));
replacements.SetPort(
- reinterpret_cast<const wchar_t*>(portStr.characters()),
+ reinterpret_cast<const UTF16Char*>(portStr.characters()),
url_parse::Component(0, portStr.length()));
} else {
@@ -661,7 +661,7 @@ String decodeURLEscapeSequences(const String& str, const TextEncoding& encoding)
// Convert that 8-bit to UTF-16. It's not clear IE does this at all to
// JavaScript URLs, but Firefox and Safari do.
- url_canon::RawCanonOutputT<wchar_t> utf16;
+ url_canon::RawCanonOutputT<UTF16Char> utf16;
for (int i = 0; i < unescaped.length(); i++) {
unsigned char uch = static_cast<unsigned char>(unescaped.at(i));
if (uch < 0x80) {