Chromium side of merge 40314:40364.

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 1266 matching lines @@
 // 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) {
   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::StdWStringToString(encoding_name));
-    page_->mainFrame()->loader()->reloadAllowingStaleData(new_encoding_name);
+    page_->mainFrame()->loader()->reloadWithOverrideEncoding(new_encoding_name);
   }
 }
 
 // Return the canonical encoding name of current main webframe in webview.
 std::wstring WebViewImpl::GetMainFrameEncodingName() {
   if (!page_.get())
     return std::wstring();
 
   String encoding_name = page_->mainFrame()->loader()->encoding();
   return webkit_glue::StringToStdWString(encoding_name);
@@ skipping 330 matching lines @@
   Frame* frame = page_->focusController()->focusedFrame();
   if (!frame)
     return NULL;
 
   Document* document = frame->document();
   if (!document)
     return NULL;
 
   return document->focusedNode();
 }