Changeset 147336 in webkit

Timestamp:

Apr 1, 2013 9:54:16 AM (11 years ago)

Author:

Nate Chapin

Message:

Make a bunch of DocumentLoader functions private
​https://bugs.webkit.org/show_bug.cgi?id=113601

Reviewed by Alexey Proskuryakov.

No new tests, cleanup only.

• loader/DocumentLoader.cpp:
• loader/DocumentLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (5 diffs)
• loader/DocumentLoader.h (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-01  Nate Chapin  <japhet@chromium.org>
+
+        Make a bunch of DocumentLoader functions private
+        https://bugs.webkit.org/show_bug.cgi?id=113601
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests, cleanup only.
+
+        * loader/DocumentLoader.cpp:
+        * loader/DocumentLoader.h:
+
 2013-04-01  Kangil Han  <kangil.han@samsung.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -453 +453 @@
 void DocumentLoader::handleSubstituteDataLoadSoon()
 {
-    if (deferMainResourceDataLoad())
+    if (m_deferMainResourceDataLoad)
         startDataLoadTimer();
     else
@@ -613 +613 @@
     }
 
-    setResponse(response);
+    m_response = response;
 
     if (m_identifierForLoadWithoutResourceLoader)
@@ -846 +846 @@
     // Workaround for <rdar://problem/6060782>
     if (m_response.isNull())
-        setResponse(ResourceResponse(KURL(), "text/html", 0, String(), String()));
+        m_response = ResourceResponse(KURL(), "text/html", 0, String(), String());
 #endif
 
@@ -1271 +1271 @@
         url = requestURL();
     if (url.isEmpty())
-        url = responseURL();
+        url = m_response.url();
     return url;
 }
@@ -1364 +1364 @@
         m_request.setURL(blankURL());
     String mimeType = shouldLoadEmpty ? "text/html" : frameLoader()->client()->generatedMIMETypeForURLScheme(m_request.url().protocol());
-    setResponse(ResourceResponse(m_request.url(), mimeType, 0, String(), String()));
+    m_response = ResourceResponse(m_request.url(), mimeType, 0, String(), String());
     finishedLoading(monotonicallyIncreasingTime());
     return true;

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -97 +97 @@
         
         DocumentWriter* writer() const { return &m_writer; }
-        Document* document() const;
 
         const ResourceRequest& originalRequest() const;
@@ -104 +103 @@
         const ResourceRequest& request() const;
         ResourceRequest& request();
-        void setRequest(const ResourceRequest&);
 
         CachedResourceLoader* cachedResourceLoader() const { return m_cachedResourceLoader.get(); }
@@ -113 +111 @@
         const KURL& url() const;
         const KURL& unreachableURL() const;
-
-        // The URL of the document resulting from this DocumentLoader.
-        KURL documentURL() const;
 
         const KURL& originalURL() const;
@@ -128 +123 @@
         bool isCommitted() const { return m_committed; }
         bool isLoading() const;
-        void receivedData(const char*, int);
-        void setupForReplace();
-        void finishedLoading(double finishTime);
         const ResourceResponse& response() const { return m_response; }
         const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
-        void mainReceivedError(const ResourceError&);
-        void setResponse(const ResourceResponse& response) { m_response = response; }
         bool isClientRedirect() const { return m_isClientRedirect; }
         void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isClientRedirect; }
@@ -231 +221 @@
         void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*);
 
-        void maybeFinishLoadingMultipartContent();
-
         void setDeferMainResourceDataLoad(bool defer) { m_deferMainResourceDataLoad = defer; }
-        bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
         
         void didTellClientAboutLoad(const String& url)
@@ -254 +241 @@
         void resetTiming() { m_documentLoadTiming = DocumentLoadTiming(); }
 
-        void responseReceived(const ResourceResponse&);
-
         // The WebKit layer calls this function when it's ready for the data to
         // actually be added to the document.
@@ -271 +256 @@
 
     private:
+
+        // The URL of the document resulting from this DocumentLoader.
+        KURL documentURL() const;
+        Document* document() const;
+
+        void setRequest(const ResourceRequest&);
+
         void commitIfReady();
         void setMainDocumentError(const ResourceError&);
         void commitLoad(const char*, int);
         void clearMainResourceLoader();
+
+        void setupForReplace();
+        void maybeFinishLoadingMultipartContent();
         
         bool maybeCreateArchive();
@@ -282 +277 @@
 
         void willSendRequest(ResourceRequest&, const ResourceResponse&);
+        void finishedLoading(double finishTime);
+        void mainReceivedError(const ResourceError&);
         virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) OVERRIDE;
         virtual void responseReceived(CachedResource*, const ResourceResponse&) OVERRIDE;