Title: [176520] trunk/Source/WebCore
- Revision
- 176520
- Author
- [email protected]
- Date
- 2014-11-24 09:02:25 -0800 (Mon, 24 Nov 2014)
Log Message
[Curl] Compile error in ResourceHandleManager.cpp.
https://bugs.webkit.org/show_bug.cgi?id=139026
Patch by [email protected] <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176519 => 176520)
--- trunk/Source/WebCore/ChangeLog 2014-11-24 14:49:39 UTC (rev 176519)
+++ trunk/Source/WebCore/ChangeLog 2014-11-24 17:02:25 UTC (rev 176520)
@@ -1,3 +1,17 @@
+2014-11-24 [email protected] <[email protected]>
+
+ [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 <[email protected]>
AX: [ATK] Unskip the skipped ATK tests in roles-exposed.html
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (176519 => 176520)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-11-24 14:49:39 UTC (rev 176519)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-11-24 17:02:25 UTC (rev 176520)
@@ -229,7 +229,7 @@
}
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 @@
return sent;
}
-void ResourceHandleManager::downloadTimerCallback(Timer* /* timer */)
+void ResourceHandleManager::downloadTimerCallback()
{
startScheduledJobs();
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h (176519 => 176520)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h 2014-11-24 14:49:39 UTC (rev 176519)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h 2014-11-24 17:02:25 UTC (rev 176520)
@@ -76,7 +76,7 @@
private:
ResourceHandleManager();
~ResourceHandleManager();
- void downloadTimerCallback(Timer*);
+ void downloadTimerCallback();
void removeFromCurl(ResourceHandle*);
bool removeScheduledJob(ResourceHandle*);
void startJob(ResourceHandle*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
