Move alternate 404 error page loading out of WebFrame and into RenderView....

webkit/glue/webview_delegate.h

 // Copyright (c) 2006-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.
 
 // WebCore provides hooks for several kinds of functionality, allowing separate
 // classes termed "delegates" to receive notifications (in the form of direct
 // function calls) when certain events are about to occur or have just occurred.
 // In some cases, the delegate implements the needed functionality; in others,
 // the delegate has some control over the behavior but doesn't actually
 // implement it.  For example, the UI delegate is responsible for showing a
@@ skipping 16 matching lines @@
 #define WEBKIT_GLUE_WEBVIEW_DELEGATE_H_
 
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
 #include "webkit/api/public/WebNavigationPolicy.h"
 #include "webkit/api/public/WebNavigationType.h"
 #include "webkit/api/public/WebTextDirection.h"
 #include "webkit/api/public/WebWidgetClient.h"
 #include "webkit/glue/context_menu.h"
+#include "webkit/glue/webframe.h"
 
 namespace webkit_glue {
 class WebMediaPlayerDelegate;
 }
 
 namespace WebCore {
 class AccessibilityObject;
 }
 
 namespace WebKit {
@@ skipping 270 matching lines @@
   //  @param frame The frame for which the error occurred
   //  @discussion This method is called after the provisional data source has
   //  failed to load.  The frame will continue to display the contents of the
   //  committed data source if there is one.
   //  This notification is only received for errors like network errors.
   virtual void DidFailProvisionalLoadWithError(WebView* webview,
                                                const WebKit::WebURLError& error,
                                                WebFrame* frame) {
   }
 
-  // If the provisional load fails, we try to load a an error page describing
-  // the user about the load failure.  |html| is the UTF8 text to display.  If
-  // |html| is empty, we will fall back on a local error page.
-  virtual void LoadNavigationErrorPage(
-      WebFrame* frame,
-      const WebKit::WebURLRequest& failed_request,
-      const WebKit::WebURLError& error,
-      const std::string& html,
-      bool replace) {
+  // Notifies the delegate to commit data for the given frame.  The delegate
+  // may optionally convert the data before calling CommitDocumentData or
+  // suppress a call to CommitDocumentData.  For example, if CommitDocumentData
+  // is never called, then an empty document will be created.
+  virtual void DidReceiveDocumentData(WebFrame* frame,
+                                      const char* data,
+                                      size_t data_len) {
+    frame->CommitDocumentData(data, data_len);
   }
 
   // Notifies the delegate that the load has changed from provisional to
   // committed. This method is called after the provisional data source has
   // become the committed data source.
   //
   // In some cases, a single load may be committed more than once. This
   // happens in the case of multipart/x-mixed-replace, also known as "server
   // push". In this case, a single location change leads to multiple documents
   // that are loaded in sequence. When this happens, a new commit will be sent
@@ skipping 136 matching lines @@
   //  - (void)webView:(WebView *)sender willCloseFrame:(WebFrame *)frame;
   virtual void WillCloseFrame(WebView* webview, WebFrame* frame) {
   }
 
   // ResourceLoadDelegate ----------------------------------------------------
 
   // Associates the given identifier with the initial resource request.
   // Resource load callbacks will use the identifier throughout the life of the
   // request.
   virtual void AssignIdentifierToRequest(
-      WebView* webview,
+      WebFrame* webframe,
       uint32 identifier,
       const WebKit::WebURLRequest& request) {
   }
 
   // Notifies the delegate that a request is about to be sent out, giving the
   // delegate the opportunity to modify the request.  Note that request is
   // writable here, and changes to the URL, for example, will change the request
   // to be made.
-  virtual void WillSendRequest(WebView* webview,
+  virtual void WillSendRequest(WebFrame* webframe,
                                uint32 identifier,
                                WebKit::WebURLRequest* request) {
   }
 
+  virtual void DidReceiveResponse(WebFrame* webframe,
+                                  uint32 identifier,
+                                  const WebKit::WebURLResponse& response) {
+  }
+
   // Notifies the delegate that a subresource load has succeeded.
-  virtual void DidFinishLoading(WebView* webview, uint32 identifier) {
+  virtual void DidFinishLoading(WebFrame* webframe, uint32 identifier) {
   }
 
   // Notifies the delegate that a subresource load has failed, and why.
-  virtual void DidFailLoadingWithError(WebView* webview,
+  virtual void DidFailLoadingWithError(WebFrame* webframe,
                                        uint32 identifier,
                                        const WebKit::WebURLError& error) {
   }
 
   // ChromeClient ------------------------------------------------------------
 
   // Appends a line to the application's error console.  The message contains
   // an error description or other information, the line_no provides a line
   // number (e.g. for a JavaScript error report), and the source_id contains
   // a URL or other description of the source of the message.
@@ skipping 226 matching lines @@
   // indicates if there was a network error. The image is empty if there was
   // a network error, the contents of the page couldn't by converted to an
   // image, or the response from the host was not 200.
   // NOTE: image is empty if the response didn't contain image data.
   virtual void DidDownloadImage(int id,
                                 const GURL& image_url,
                                 bool errored,
                                 const SkBitmap& image) {
   }
 
-  enum ErrorPageType {
-    DNS_ERROR,
-    HTTP_404,
-    CONNECTION_ERROR,
-  };
-  // If providing an alternate error page (like link doctor), returns the URL
-  // to fetch instead.  If an invalid url is returned, just fall back on local
-  // error pages. |error_name| tells the delegate what type of error page we
-  // want (e.g., 404 vs dns errors).
-  virtual GURL GetAlternateErrorPageURL(const GURL& failedURL,
-                                        ErrorPageType error_type);
-
   // History Related ---------------------------------------------------------
 
   // Tells the embedder to navigate back or forward in session history by the
   // given offset (relative to the current position in session history).
   virtual void NavigateBackForwardSoon(int offset) {
   }
 
   // Returns how many entries are in the back and forward lists, respectively.
   virtual int GetHistoryBackListCount() {
     return 0;
@@ skipping 70 matching lines @@
   virtual void DidAddHistoryItem() { }
 
   WebViewDelegate() { }
   virtual ~WebViewDelegate() { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebViewDelegate);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_DELEGATE_H_