Add Reload and LoadData methods to 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 34 matching lines @@
 class WebPluginDelegate;
 class WebView;
 class WebViewImpl;
 class WebTextInput;
 class WebTextInputImpl;
 
 namespace WebCore {
 class Frame;
 class FrameView;
 class HistoryItem;
+class KURL;
 class Node;
 class Range;
 class SubstituteData;
 struct WindowFeatures;
 }
 
 namespace gfx {
 class BitmapPlatformDevice;
 }
 
 // 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 LoadHTMLString(const std::string& html_text,
-                              const GURL& base_url);
-  virtual void LoadAlternateHTMLString(const WebKit::WebURLRequest& request,
-                                       const std::string& html_text,
-                                       const GURL& display_url,
-                                       bool replace);
-  virtual void LoadAlternateHTMLErrorPage(const WebKit::WebURLRequest& request,
-                                          const WebKit::WebURLError& error,
-                                          const GURL& error_page_url,
-                                          bool replace,
-                                          const GURL& fake_url);
+  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 ExecuteScript(const WebKit::WebScriptSource& source);
   virtual void ExecuteScriptInNewContext(
       const WebKit::WebScriptSource* sources, int num_sources);
   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;
@@ skipping 155 matching lines @@
   webkit_glue::PasswordAutocompleteListener* GetPasswordListener(
       WebCore::HTMLInputElement* user_name_input_element);
 
  protected:
   friend class WebFrameLoaderClient;
 
   // Informs the WebFrame that the Frame is being closed, called by the
   // WebFrameLoaderClient
   void Closing();
 
+#if 0
   // A helper function for loading some document, given all of its data, into
   // this frame.  The charset may be empty if unknown, but a mime type must be
   // specified.  TODO(darin): Add option for storing this in session history.
   void LoadDocumentData(const WebCore::KURL& base_url,
                         const WebCore::String& data,
                         const WebCore::String& mime_type,
                         const WebCore::String& charset);
+#endif
 
   // 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<AltErrorPageResourceFetcher> alt_error_page_fetcher_;
 
@@ skipping 95 matching lines @@
   // is a repeat search that already returned nothing last time the same prefix
   // was searched.
   bool ShouldScopeMatches(const string16& search_text);
 
   // Only for test_shell
   int PendingFrameUnloadEventCount() const;
 
   // Determines whether to invalidate the content area and scrollbar.
   void InvalidateIfNecessary();
 
-  void InternalLoadRequest(const WebKit::WebURLRequest& request,
-                           const WebCore::SubstituteData& data,
-                           bool replace);
-
   // Clears the map of password listeners.
   void ClearPasswordListeners();
 
+  void LoadJavaScriptURL(const WebCore::KURL& url);
+
   // Valid between calls to BeginPrint() and EndPrint(). Containts the print
   // information. Is used by PrintPage().
   scoped_ptr<ChromePrintContext> print_context_;
 
   // 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_