[Curl] Compile error in ResourceHandleManager.cpp.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Nov 2014 17:02:25 +0000 (17:02 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Nov 2014 17:02:25 +0000 (17:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=139026

Patch by peavo@outlook.com <peavo@outlook.com> on 2014-11-24
Reviewed by Brent Fulgham.

The parameter types of the constructor of the Timer class has changed.

* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::ResourceHandleManager):
(WebCore::ResourceHandleManager::downloadTimerCallback):
* platform/network/curl/ResourceHandleManager.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176520 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/curl/ResourceHandleManager.cpp
Source/WebCore/platform/network/curl/ResourceHandleManager.h

index a57faf1..b623b0e 100644 (file)
@@ -1,3 +1,17 @@
+2014-11-24  peavo@outlook.com  <peavo@outlook.com>
+
+        [Curl] Compile error in ResourceHandleManager.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=139026
+
+        Reviewed by Brent Fulgham.
+
+        The parameter types of the constructor of the Timer class has changed.
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::ResourceHandleManager):
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+        * platform/network/curl/ResourceHandleManager.h:
+
 2014-11-24  Joanmarie Diggs  <jdiggs@igalia.com>
 
         AX: [ATK] Unskip the skipped ATK tests in roles-exposed.html
index 9e82e67..f3c9c71 100644 (file)
@@ -229,7 +229,7 @@ inline static bool isHttpAuthentication(int statusCode)
 }
 
 ResourceHandleManager::ResourceHandleManager()
-    : m_downloadTimer(this, &ResourceHandleManager::downloadTimerCallback)
+    : m_downloadTimer(*this, &ResourceHandleManager::downloadTimerCallback)
     , m_cookieJarFileName(cookieJarPath())
     , m_certificatePath (certificatePath())
     , m_runningJobs(0)
@@ -620,7 +620,7 @@ size_t readCallback(void* ptr, size_t size, size_t nmemb, void* data)
     return sent;
 }
 
-void ResourceHandleManager::downloadTimerCallback(Timer* /* timer */)
+void ResourceHandleManager::downloadTimerCallback()
 {
     startScheduledJobs();
 
index 54f26d0..e524fe4 100644 (file)
@@ -76,7 +76,7 @@ public:
 private:
     ResourceHandleManager();
     ~ResourceHandleManager();
-    void downloadTimerCallback(Timer*);
+    void downloadTimerCallback();
     void removeFromCurl(ResourceHandle*);
     bool removeScheduledJob(ResourceHandle*);
     void startJob(ResourceHandle*);