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

webkit/glue/webframe_impl.h

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 44 matching lines @@
 class Frame;
 class FrameView;
 class HistoryItem;
 class KURL;
 class Node;
 class Range;
 class SubstituteData;
 struct WindowFeatures;
 }
 
-namespace webkit_glue {
-class AltErrorPageResourceFetcher;
-}
-
 // Implementation of WebFrame, note that this is a reference counted object.
 class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
  public:
   WebFrameImpl();
   ~WebFrameImpl();
 
   static int live_object_count() {
     return live_object_count_;
   }
 
   // Called by the WebViewImpl to initialize its main frame:
   void InitMainFrame(WebViewImpl* webview_impl);
 
   // WebFrame
   virtual void Reload();
   virtual void LoadRequest(const WebKit::WebURLRequest& request);
   virtual void LoadHistoryItem(const WebKit::WebHistoryItem& item);
   virtual void LoadData(
       const WebKit::WebData& data,
       const WebKit::WebString& mime_type,
       const WebKit::WebString& text_encoding,
       const WebKit::WebURL& base_url,
       const WebKit::WebURL& unreachable_url = WebKit::WebURL(),
       bool replace = false);
   virtual void LoadHTMLString(
       const WebKit::WebData& data,
       const WebKit::WebURL& base_url,
       const WebKit::WebURL& unreachable_url = WebKit::WebURL(),
       bool replace = false);
-  virtual void LoadAlternateHTMLErrorPage(
-      const WebKit::WebURLRequest& request,
-      const WebKit::WebURLError& error,
-      const GURL& error_page_url,
-      bool replace,
-      const GURL& fake_url);
   virtual void DispatchWillSendRequest(WebKit::WebURLRequest* request);
   virtual void ExecuteScript(const WebKit::WebScriptSource& source);
   virtual void ExecuteScriptInNewContext(
       const WebKit::WebScriptSource* sources, int num_sources,
       int extension_group);
   virtual void ExecuteScriptInNewWorld(
       const WebKit::WebScriptSource* sources, int num_sources,
       int extension_group);
   virtual bool InsertCSSStyles(const std::string& css);
   virtual WebKit::WebHistoryItem GetPreviousHistoryItem() const;
   virtual WebKit::WebHistoryItem GetCurrentHistoryItem() const;
   virtual GURL GetURL() const;
   virtual GURL GetFavIconURL() const;
   virtual GURL GetOSDDURL() const;
   virtual int GetContentsPreferredWidth() const;
   virtual WebKit::WebDataSource* GetDataSource() const;
   virtual WebKit::WebDataSource* GetProvisionalDataSource() const;
   virtual void StopLoading();
+  virtual bool IsLoading() const;
   virtual WebFrame* GetOpener() const;
   virtual WebFrame* GetParent() const;
   virtual WebFrame* GetTop() const;
   virtual WebFrame* GetChildFrame(const std::wstring& xpath) const;
   virtual WebView* GetView() const;
   virtual void GetForms(std::vector<WebKit::WebForm>* forms) const;
   virtual std::string GetSecurityOrigin() const;
 
   // This method calls createRuntimeObject (in KJS::Bindings::Instance), which
   // increments the refcount of the NPObject passed in.
@@ skipping 69 matching lines @@
   virtual void PrintEnd();
 
   PassRefPtr<WebCore::Frame> CreateChildFrame(
       const WebCore::FrameLoadRequest&,
       WebCore::HTMLFrameOwnerElement* owner_element);
 
   // WebFrameImpl
   void Layout();
   void Paint(skia::PlatformCanvas* canvas, const WebKit::WebRect& rect);
 
-  bool IsLoading();
-
   void CreateFrameView();
 
   // The plugin delegate is used to get notifications when downloads complete.
   // This is used by the NPAPI method getURLNotify.  plugin_delegate() may
   // return NULL.  TODO(darin): how come there is only one per frame?!?
   WebPluginDelegate* plugin_delegate() const {
     return plugin_delegate_;
   }
   void set_plugin_delegate(WebPluginDelegate* plugin_delegate) {
     plugin_delegate_ = plugin_delegate;
@@ skipping 57 matching lines @@
   // Informs the WebFrame that the Frame is being closed, called by the
   // WebFrameLoaderClient
   void Closing();
 
   // See WebFrame.h for details.
   virtual void IncreaseMatchCount(int count, int request_id);
   virtual void ReportFindInPageSelection(const WebKit::WebRect& selection_rect,
                                          int active_match_ordinal,
                                          int request_id);
 
-  // Resource fetcher for downloading an alternate DNS error page.
-  scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
-
   // Used to check for leaks of this object.
   static int live_object_count_;
 
   WebFrameLoaderClient frame_loader_client_;
 
   // This is a factory for creating cancelable tasks for this frame that run
   // asynchronously in order to scope string matches during a find operation.
   ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_;
 
   // This is a weak pointer to our corresponding WebCore frame.  A reference to
@@ skipping 109 matching lines @@
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
       webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap;
   PasswordListenerMap password_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_IMPL_H_