Bugfix for 2932

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "CSSStyleSelector.h"
@@ skipping 1387 matching lines @@
 void WebViewImpl::SetInspectorSettings(const std::wstring& settings) {
   inspector_settings_ = settings;
 }
 
 // Set the encoding of the current main frame to the one selected by
 // a user in the encoding menu.
 void WebViewImpl::SetPageEncoding(const std::string& encoding_name) {
   if (!page_.get())
     return;
 
-  if (!encoding_name.empty()) {
-    // only change override encoding, don't change default encoding
-    // TODO(brettw) use std::string for encoding names.
-    String new_encoding_name(webkit_glue::StdStringToString(encoding_name));
-    page_->mainFrame()->loader()->reloadWithOverrideEncoding(new_encoding_name);
-  }
+  // Only change override encoding, don't change default encoding.
+  // Note that the new encoding must be NULL if it isn't supposed to be set.
+  String new_encoding_name;
+  if (!encoding_name.empty())
+    new_encoding_name = webkit_glue::StdStringToString(encoding_name);
+  page_->mainFrame()->loader()->reloadWithOverrideEncoding(new_encoding_name);
 }
 
 // Return the canonical encoding name of current main webframe in webview.
 std::string WebViewImpl::GetMainFrameEncodingName() {
   if (!page_.get())
     return std::string();
 
   String encoding_name = page_->mainFrame()->loader()->encoding();
   return webkit_glue::StringToStdString(encoding_name);
 }
@@ skipping 473 matching lines @@
 
   return document->focusedNode();
 }
 
 HitTestResult WebViewImpl::HitTestResultForWindowPos(const IntPoint& pos) {
   IntPoint doc_point(
       page_->mainFrame()->view()->windowToContents(pos));
   return page_->mainFrame()->eventHandler()->
       hitTestResultAtPoint(doc_point, false);
 }