Changeset 176520 in webkit

Timestamp:

Nov 24, 2014, 9:02:25 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Compile error in ResourceHandleManager.cpp.
​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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.cpp (modified) (2 diffs)
• platform/network/curl/ResourceHandleManager.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -230 +230 @@
 
 ResourceHandleManager::ResourceHandleManager()
-    : m_downloadTimer(this, &ResourceHandleManager::downloadTimerCallback)
+    : m_downloadTimer(*this, &ResourceHandleManager::downloadTimerCallback)
     , m_cookieJarFileName(cookieJarPath())
     , m_certificatePath (certificatePath())
@@ -621 +621 @@
 }
 
-void ResourceHandleManager::downloadTimerCallback(Timer* /* timer */)
+void ResourceHandleManager::downloadTimerCallback()
 {
     startScheduledJobs();

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h

@@ -77 +77 @@
     ResourceHandleManager();
     ~ResourceHandleManager();
-    void downloadTimerCallback(Timer*);
+    void downloadTimerCallback();
     void removeFromCurl(ResourceHandle*);
     bool removeScheduledJob(ResourceHandle*);