Changeset 118644 in webkit

Timestamp:

May 27, 2012, 9:22:47 PM (14 years ago)

Author:

benjamin@webkit.org

Message:

Minor code cleaning for the interface of MainResourceLoader
​https://bugs.webkit.org/show_bug.cgi?id=87607

Reviewed by Darin Adler.

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::MainResourceLoader):
(WebCore::MainResourceLoader::handleSubstituteDataLoadNow):
(WebCore::MainResourceLoader::handleSubstituteDataLoadSoon):

• loader/MainResourceLoader.h:

(MainResourceLoader):
-Add the OVERRIDE keyword for the methods inherited from ResourceLoader.
-Remove the useless declaration of handleDataLoad(ResourceRequest&), this method does not exist.
-Rename handleDataLoadNow() to handleSubstituteDataLoadNow() and make the method private. This should

only be used by handleSubstituteDataLoadSoon() and indirectly through the timer.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (3 diffs)
• loader/MainResourceLoader.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-27  Benjamin Poulain  <benjamin@webkit.org>
+
+        Minor code cleaning for the interface of MainResourceLoader
+        https://bugs.webkit.org/show_bug.cgi?id=87607
+
+        Reviewed by Darin Adler.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::MainResourceLoader):
+        (WebCore::MainResourceLoader::handleSubstituteDataLoadNow):
+        (WebCore::MainResourceLoader::handleSubstituteDataLoadSoon):
+        * loader/MainResourceLoader.h:
+        (MainResourceLoader):
+        -Add the OVERRIDE keyword for the methods inherited from ResourceLoader.
+        -Remove the useless declaration of handleDataLoad(ResourceRequest&), this method does not exist.
+        -Rename handleDataLoadNow() to handleSubstituteDataLoadNow() and make the method private. This should
+         only be used by handleSubstituteDataLoadSoon() and indirectly through the timer.
+
 2012-05-27  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -73 +73 @@
 MainResourceLoader::MainResourceLoader(Frame* frame)
     : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForCrossOriginCredentials, SkipSecurityCheck))
-    , m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
+    , m_dataLoadTimer(this, &MainResourceLoader::handleSubstituteDataLoadNow)
     , m_loadingMultipartContent(false)
     , m_waitingForContentPolicy(false)
@@ -581 +581 @@
 }
 
-void MainResourceLoader::handleDataLoadNow(MainResourceLoaderTimer*)
+void MainResourceLoader::handleSubstituteDataLoadNow(MainResourceLoaderTimer*)
 {
     RefPtr<MainResourceLoader> protect(this);
@@ -614 +614 @@
         startDataLoadTimer();
     else
-        handleDataLoadNow(0);
+        handleSubstituteDataLoadNow(0);
 }
 

trunk/Source/WebCore/loader/MainResourceLoader.h

@@ -56 +56 @@
 
         void load(const ResourceRequest&, const SubstituteData&);
-        virtual void addData(const char*, int, bool allAtOnce);
+        virtual void addData(const char*, int, bool allAtOnce) OVERRIDE;
 
-        virtual void setDefersLoading(bool);
+        virtual void setDefersLoading(bool) OVERRIDE;
 
-        virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
-        virtual void didReceiveResponse(const ResourceResponse&);
-        virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce);
-        virtual void didFinishLoading(double finishTime);
-        virtual void didFail(const ResourceError&);
+        virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
+        virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
+        virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce) OVERRIDE;
+        virtual void didFinishLoading(double finishTime) OVERRIDE;
+        virtual void didFail(const ResourceError&) OVERRIDE;
 
 #if HAVE(RUNLOOP_TIMER)
@@ -72 +72 @@
 #endif
 
-        void handleDataLoadNow(MainResourceLoaderTimer*);
-
         bool isLoadingMultipartContent() const { return m_loadingMultipartContent; }
 
@@ -79 +77 @@
         MainResourceLoader(Frame*);
 
-        virtual void willCancel(const ResourceError&);
-        virtual void didCancel(const ResourceError&);
+        virtual void willCancel(const ResourceError&) OVERRIDE;
+        virtual void didCancel(const ResourceError&) OVERRIDE;
 
         bool loadNow(ResourceRequest&);
@@ -86 +84 @@
         void handleEmptyLoad(const KURL&, bool forURLScheme);
         void handleSubstituteDataLoadSoon(const ResourceRequest&);
+        void handleSubstituteDataLoadNow(MainResourceLoaderTimer*);
 
         void startDataLoadTimer();
-        void handleDataLoad(ResourceRequest&);
 
         void receivedError(const ResourceError&);