Title: [150118] trunk/Source/WebCore
- Revision
- 150118
- Author
- [email protected]
- Date
- 2013-05-15 09:22:14 -0700 (Wed, 15 May 2013)
Log Message
[curl] Remove version #if guards
https://bugs.webkit.org/show_bug.cgi?id=116152
Patch by Peter Gal <[email protected]> on 2013-05-15
Reviewed by Brent Fulgham.
No tests required.
* platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::ResourceHandle::platformSetDefersLoading): Removed version guard.
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::writeCallback): Ditto.
(WebCore::headerCallback): Ditto.
(WebCore::readCallback): Ditto.
(WebCore::ResourceHandleManager::dispatchSynchronousJob): Ditto.
(WebCore::ResourceHandleManager::initializeHandle): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150117 => 150118)
--- trunk/Source/WebCore/ChangeLog 2013-05-15 16:13:23 UTC (rev 150117)
+++ trunk/Source/WebCore/ChangeLog 2013-05-15 16:22:14 UTC (rev 150118)
@@ -1,3 +1,21 @@
+2013-05-15 Peter Gal <[email protected]>
+
+ [curl] Remove version #if guards
+ https://bugs.webkit.org/show_bug.cgi?id=116152
+
+ Reviewed by Brent Fulgham.
+
+ No tests required.
+
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ (WebCore::ResourceHandle::platformSetDefersLoading): Removed version guard.
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::writeCallback): Ditto.
+ (WebCore::headerCallback): Ditto.
+ (WebCore::readCallback): Ditto.
+ (WebCore::ResourceHandleManager::dispatchSynchronousJob): Ditto.
+ (WebCore::ResourceHandleManager::initializeHandle): Ditto.
+
2013-05-15 David Kilzer <[email protected]>
BUILD FIX (r150089): Make WebCoreTestShim build for iOS
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (150117 => 150118)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2013-05-15 16:13:23 UTC (rev 150117)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2013-05-15 16:22:14 UTC (rev 150118)
@@ -146,7 +146,6 @@
void ResourceHandle::platformSetDefersLoading(bool defers)
{
-#if LIBCURL_VERSION_NUM > 0x071200
if (!d->m_handle)
return;
@@ -161,9 +160,6 @@
// Restarting the handle has failed so just cancel it.
cancel();
}
-#else
- LOG_ERROR("Deferred loading is implemented if libcURL version is above 7.18.0");
-#endif
}
bool ResourceHandle::loadsBlocked()
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (150117 => 150118)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2013-05-15 16:13:23 UTC (rev 150117)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2013-05-15 16:22:14 UTC (rev 150118)
@@ -210,10 +210,8 @@
if (d->m_cancelled)
return 0;
-#if LIBCURL_VERSION_NUM > 0x071200
// We should never be called when deferred loading is activated.
ASSERT(!d->m_defersLoading);
-#endif
size_t totalSize = size * nmemb;
@@ -253,10 +251,8 @@
if (d->m_cancelled)
return 0;
-#if LIBCURL_VERSION_NUM > 0x071200
// We should never be called when deferred loading is activated.
ASSERT(!d->m_defersLoading);
-#endif
size_t totalSize = size * nmemb;
ResourceHandleClient* client = d->client();
@@ -338,10 +334,8 @@
if (d->m_cancelled)
return 0;
-#if LIBCURL_VERSION_NUM > 0x071200
// We should never be called when deferred loading is activated.
ASSERT(!d->m_defersLoading);
-#endif
if (!size || !nmemb)
return 0;
@@ -619,12 +613,10 @@
ResourceHandleInternal* handle = job->getInternal();
-#if LIBCURL_VERSION_NUM > 0x071200
// If defersLoading is true and we call curl_easy_perform
// on a paused handle, libcURL would do the transfert anyway
// and we would assert so force defersLoading to be false.
handle->m_defersLoading = false;
-#endif
initializeHandle(job);
@@ -687,14 +679,12 @@
d->m_handle = curl_easy_init();
-#if LIBCURL_VERSION_NUM > 0x071200
if (d->m_defersLoading) {
CURLcode error = curl_easy_pause(d->m_handle, CURLPAUSE_ALL);
// If we did not pause the handle, we would ASSERT in the
// header callback. So just assert here.
ASSERT_UNUSED(error, error == CURLE_OK);
}
-#endif
#ifndef NDEBUG
if (getenv("DEBUG_CURL"))
curl_easy_setopt(d->m_handle, CURLOPT_VERBOSE, 1);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
