Add Reload and LoadData methods to WebFrame.

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 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 <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 49 matching lines @@
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/webview_delegate.h"
 #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;
 using WebKit::WrappedResourceResponse;
 
 // Domain for internal error codes.
 static const char kInternalErrorDomain[] = "webkit_glue";
 
 // An internal error code.  Used to note a policy change error resulting from
 // dispatchDecidePolicyForMIMEType not passing the PolicyUse option.
@@ skipping 270 matching lines @@
   if (webframe_->frame()->inViewSourceMode())
     return GURL();
 
   // Construct the URL to fetch from the alt error page server. "html404"
   // is understood by the link doctor server.
   return d->GetAlternateErrorPageURL(failedURL, WebViewDelegate::HTTP_404);
 }
 
 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);
   }
 }
 
 void WebFrameLoaderClient::dispatchDidFailLoading(DocumentLoader* loader,
                                                   unsigned long identifier,
                                                   const ResourceError& error) {
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   if (webview && webview->delegate()) {
     webview->delegate()->DidFailLoadingWithError(
         webview, identifier, webkit_glue::ResourceErrorToWebURLError(error));
@@ skipping 1155 matching lines @@
 
   std::string offset_str = url.ExtractFileName();
   int offset;
   if (!StringToInt(offset_str, &offset))
     return;
 
   WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
   if (d)
     d->NavigateBackForwardSoon(offset);
 }