Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: webkit/glue/webframeloaderclient_impl.cc

Issue 150146: Add Reload and LoadData methods to WebFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webframe_unittest.cc ('k') | webkit/tools/test_shell/plugin_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webframeloaderclient_impl.cc
===================================================================
--- webkit/glue/webframeloaderclient_impl.cc (revision 19736)
+++ webkit/glue/webframeloaderclient_impl.cc (working copy)
@@ -67,9 +67,13 @@
#include "webkit/glue/webview_impl.h"
using namespace WebCore;
+
using base::Time;
using base::TimeDelta;
+
+using WebKit::WebData;
using WebKit::WebNavigationType;
+using WebKit::WebString;
using WebKit::WebURL;
using WebKit::WebVector;
using WebKit::WrappedResourceRequest;
@@ -360,14 +364,14 @@
void WebFrameLoaderClient::Alt404PageFinished(DocumentLoader* loader,
const std::string& html) {
+ const WebURL& base_url = webkit_glue::KURLToWebURL(loader->url());
if (html.length() > 0) {
// TODO(tc): Handle backoff on so we don't hammer the alt error page
// servers.
- webframe_->LoadHTMLString(html, webkit_glue::KURLToGURL(loader->url()));
+ webframe_->LoadHTMLString(html, base_url);
} else {
// Fall back on original text
- webframe_->LoadHTMLString(postponed_data_,
- webkit_glue::KURLToGURL(loader->url()));
+ webframe_->LoadHTMLString(postponed_data_, base_url);
}
}
« no previous file with comments | « webkit/glue/webframe_unittest.cc ('k') | webkit/tools/test_shell/plugin_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698