Move alternate error page loading out of WebFrame....

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 134 matching lines @@
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebFindOptions.h"
 #include "webkit/api/public/WebForm.h"
 #include "webkit/api/public/WebHistoryItem.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURLError.h"
-#include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webtextinput_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 #if defined(OS_LINUX)
@@ skipping 431 matching lines @@
 void WebFrameImpl::StopLoading() {
   if (!frame_)
     return;
 
   // TODO(darin): Figure out what we should really do here.  It seems like a
   // bug that FrameLoader::stopLoading doesn't call stopAllLoaders.
   frame_->loader()->stopAllLoaders();
   frame_->loader()->stopLoading(false);
 }
 
+bool WebFrameImpl::IsLoading() const {
+  if (!frame_)
+    return false;
+  return frame_->loader()->isLoading();
+}
+
 WebFrame* WebFrameImpl::GetOpener() const {
   if (frame_) {
     Frame* opener = frame_->loader()->opener();
     if (opener)
       return FromFrame(opener);
   }
   return NULL;
 }
 
 WebFrame* WebFrameImpl::GetParent() const {
@@ skipping 880 matching lines @@
 #endif
     if (frame_->document() && frameview()) {
       frameview()->paint(&gc, dirty_rect);
       frame_->page()->inspectorController()->drawNodeHighlight(gc);
     } else {
       gc.fillRect(dirty_rect, Color::white);
     }
   }
 }
 
-bool WebFrameImpl::IsLoading() {
-  // I'm assuming this does what we want.
-  return frame_->loader()->isLoading();
-}
-
 void WebFrameImpl::Closing() {
-  alt_error_page_fetcher_.reset();
   frame_ = NULL;
 }
 
 void WebFrameImpl::DidReceiveData(DocumentLoader* loader,
                                   const char* data, int length) {
   // Set the text encoding.  This calls begin() for us.  It is safe to call
   // this multiple times (Mac does: page/mac/WebCoreFrameBridge.mm).
   bool user_chosen = true;
   String encoding = frame_->loader()->documentLoader()->overrideEncoding();
   if (encoding.isNull()) {
     user_chosen = false;
     encoding = loader->response().textEncodingName();
   }
   frame_->loader()->setEncoding(encoding, user_chosen);
 
   // NOTE: mac only does this if there is a document
   frame_->loader()->addData(data, length);
-
-  // It's possible that we get a DNS failure followed by a second load that
-  // succeeds before we hear back from the alternate error page server.  In
-  // that case, cancel the alt error page download.
-  alt_error_page_fetcher_.reset();
 }
 
 void WebFrameImpl::DidFail(const ResourceError& error, bool was_provisional) {
   WebViewImpl* web_view = GetWebViewImpl();
   WebViewDelegate* delegate = web_view->delegate();
   if (delegate) {
     const WebURLError& web_error =
         webkit_glue::ResourceErrorToWebURLError(error);
     if (was_provisional) {
       delegate->DidFailProvisionalLoadWithError(web_view, web_error, this);
     } else {
       delegate->DidFailLoadWithError(web_view, web_error, this);
     }
   }
 }
 
-void WebFrameImpl::LoadAlternateHTMLErrorPage(const WebURLRequest& request,
-                                              const WebURLError& error,
-                                              const GURL& error_page_url,
-                                              bool replace,
-                                              const GURL& fake_url) {
-  // Load alternate HTML in place of the previous request.  We use a fake_url
-  // for the Base URL.  That prevents other web content from the same origin
-  // as the failed URL to script the error page.
-
-  LoadHTMLString("",  // Empty document
-                 fake_url,
-                 error.unreachableURL,
-                 replace);
-
-  alt_error_page_fetcher_.reset(new AltErrorPageResourceFetcher(
-      error_page_url, this, error.unreachableURL,
-      NewCallback(this, &WebFrameImpl::AltErrorPageFinished)));
-}
-
 void WebFrameImpl::DispatchWillSendRequest(WebURLRequest* request) {
   ResourceResponse response;
   frame_->loader()->client()->dispatchWillSendRequest(NULL, 0,
       *webkit_glue::WebURLRequestToMutableResourceRequest(request),
       response);
 }
 
 void WebFrameImpl::ExecuteScript(const WebScriptSource& source) {
   frame_->loader()->executeScript(
       WebCore::ScriptSourceCode(
@@ skipping 259 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->loader()->isScheduledLocationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }
-
-void WebFrameImpl::AltErrorPageFinished(const GURL& unreachable_url,
-                                        const std::string& html) {
-  WebViewDelegate* d = GetWebViewImpl()->delegate();
-  if (!d)
-    return;
-  WebURLError error;
-  error.unreachableURL = unreachable_url;
-  d->LoadNavigationErrorPage(this, WebURLRequest(), error, html, true);
-}