Changeset 89328 in webkit

Timestamp:

Jun 20, 2011 6:35:18 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-06-20 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Group load-initiating and stopping functions in FrameLoader.h
​https://bugs.webkit.org/show_bug.cgi?id=63030

No function change, thus no tests.

• loader/FrameLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.h (modified) (9 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-20  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Group load-initiating and stopping functions in FrameLoader.h
+        https://bugs.webkit.org/show_bug.cgi?id=63030
+
+        No function change, thus no tests.
+
+        * loader/FrameLoader.h:
+
 2011-06-20  Sailesh Agrawal  <sail@chromium.org>
 

trunk/Source/WebCore/loader/FrameLoader.h

@@ -104 +104 @@
     IconController* icon() const { return &m_icon; }
 
-    // FIXME: This is not cool, people. There are too many different functions that all start loads.
-    // We should aim to consolidate these into a smaller set of functions, and try to reuse more of
-    // the logic by extracting common code paths.
-
     void prepareForLoadStart();
     void setupForReplace();
     void setupForReplaceByMIMEType(const String& newMIMEType);
 
+    // FIXME: These are all functions which start loads. We have too many.
     void loadURLIntoChildFrame(const KURL&, const String& referer, Frame*);
-
     void loadFrameRequest(const FrameLoadRequest&, bool lockHistory, bool lockBackForwardList,  // Called by submitForm, calls loadPostRequest and loadURL.
         PassRefPtr<Event>, PassRefPtr<FormState>, ReferrerPolicy);
@@ -120 +116 @@
     void load(const ResourceRequest&, const SubstituteData&, bool lockHistory);                 // Called both by WebFrame and internally, calls load(DocumentLoader*).
     void load(const ResourceRequest&, const String& frameName, bool lockHistory);               // Called by WebPluginController.
-
 #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
     void loadArchive(PassRefPtr<Archive>);
 #endif
+    unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
+
+    void changeLocation(PassRefPtr<SecurityOrigin>, const KURL&, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool refresh = false);
+    void urlSelected(const KURL&, const String& target, PassRefPtr<Event>, bool lockHistory, bool lockBackForwardList, ReferrerPolicy);
+    void submitForm(PassRefPtr<FormSubmission>);
+
+    void reload(bool endToEndReload = false);
+    void reloadWithOverrideEncoding(const String& overrideEncoding);
+
+    void open(CachedFrameBase&);
+    void loadItem(HistoryItem*, FrameLoadType);
 
     static void reportLocalLoadFailed(Frame*, const String& url);
 
-    unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
-
-    // Also not cool.
+    // FIXME: These are all functions which stop loads. We have too many.
     void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem);
     void stopForUserCancel(bool deferCheckLoadComplete = false);
+    void stop();
+    void stopLoading(UnloadEventPolicy);
+    bool closeURL();
+    void cancelAndClear();
+    void clear(bool clearWindowProperties = true, bool clearScriptObjects = true, bool clearFrameView = true);
 
     bool isLoadingMainResource() const { return m_isLoadingMainResource; }
@@ -167 +176 @@
     bool isHostedByObjectElement() const;
     bool isLoadingMainFrame() const;
-
-    void reload(bool endToEndReload = false);
-    void reloadWithOverrideEncoding(const String& overrideEncoding);
 
     void finishedLoadingDocument(DocumentLoader*);
@@ -185 +191 @@
 
     void didFirstLayout();
-
     void didFirstVisuallyNonEmptyLayout();
 
@@ -203 +208 @@
 
     void setDefersLoading(bool);
-
-    void changeLocation(PassRefPtr<SecurityOrigin>, const KURL&, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool refresh = false);
-    void urlSelected(const KURL&, const String& target, PassRefPtr<Event>, bool lockHistory, bool lockBackForwardList, ReferrerPolicy);
-
-    void submitForm(PassRefPtr<FormSubmission>);
-
-    void stop();
-    void stopLoading(UnloadEventPolicy);
-    bool closeURL();
 
     void didExplicitOpen();
@@ -259 +255 @@
     bool isComplete() const;
 
-    void cancelAndClear();
-
     void setTitle(const StringWithDirection&);
 
@@ -274 +268 @@
 
     bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&);
-
-    void open(CachedFrameBase&);
 
     // FIXME: Should these really be public?
@@ -283 +275 @@
     void clientRedirected(const KURL&, double delay, double fireDate, bool lockBackForwardList);
     void clientRedirectCancelledOrFinished(bool cancelWithLoadInProgress);
-    void loadItem(HistoryItem*, FrameLoadType);
 
     // FIXME: This is public because this asynchronous callback from the FrameLoaderClient
@@ -293 +284 @@
 
     static ObjectContentType defaultObjectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
-
-    void clear(bool clearWindowProperties = true, bool clearScriptObjects = true, bool clearFrameView = true);
 
     bool quickRedirectComing() const { return m_quickRedirectComing; }