summaryrefslogtreecommitdiffstats
path: root/webkit/port/bridge
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 19:36:52 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 19:36:52 +0000
commitbb5cf7bf59af8f86c57b1dad57e0577a6adf9f8b (patch)
tree8048d524ce33a79e385dc5191979e93fdbebcd4e /webkit/port/bridge
parentff601214f89613162994a884d5f183436bc2c978 (diff)
downloadchromium_src-bb5cf7bf59af8f86c57b1dad57e0577a6adf9f8b.zip
chromium_src-bb5cf7bf59af8f86c57b1dad57e0577a6adf9f8b.tar.gz
chromium_src-bb5cf7bf59af8f86c57b1dad57e0577a6adf9f8b.tar.bz2
cast to the correct expected type (char16).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/bridge')
-rw-r--r--webkit/port/bridge/HistoryWin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/port/bridge/HistoryWin.cpp b/webkit/port/bridge/HistoryWin.cpp
index de8378a..eafc142 100644
--- a/webkit/port/bridge/HistoryWin.cpp
+++ b/webkit/port/bridge/HistoryWin.cpp
@@ -41,7 +41,7 @@ bool historyContains(const UChar* characters, unsigned length,
// check the document's DNS prefetch settings and pass up to the renderer
CString document_host = document->securityOrigin()->host().utf8();
return webkit_glue::HistoryContains(
- reinterpret_cast<const wchar_t*>(characters), length,
+ reinterpret_cast<const char16*>(characters), length,
document_host.data(), document_host.length(),
document->isDNSPrefetchEnabled());
}