As Brett pointed it out, We normally use 8-bit for encoding names since they're always ASCII. Plus, wstrings will also be 32-bit characters on Linux and Mac, which is expensive. So I make this CL by using std::string instead of std::wstring every time you have an encoding name.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1144 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 3882c4a..bad4d06 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1093,7 +1093,7 @@ const WebPreferences& WebViewImpl::GetPreferences() {
 
 // Set the encoding of the current main frame to the one selected by
 // a user in the encoding menu.
-void WebViewImpl::SetPageEncoding(const std::wstring& encoding_name) {
+void WebViewImpl::SetPageEncoding(const std::string& encoding_name) {
   if (!main_frame_)
     return;
 
@@ -1105,12 +1105,12 @@ void WebViewImpl::SetPageEncoding(const std::wstring& encoding_name) {
 }
 
 // Return the canonical encoding name of current main webframe in webview.
-std::wstring WebViewImpl::GetMainFrameEncodingName() {
+std::string WebViewImpl::GetMainFrameEncodingName() {
   if (!main_frame_)
-    return std::wstring(L"");
+    return std::string();
 
   String encoding_name = main_frame_->frame()->loader()->encoding();
-  return std::wstring(encoding_name.charactersWithNullTermination());
+  return WideToUTF8(webkit_glue::StringToStdWString(encoding_name));
 }
 
 void WebViewImpl::MakeTextLarger() {