Changeset 150118 in webkit

Timestamp:

May 15, 2013, 9:22:14 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[curl] Remove version #if guards
​https://bugs.webkit.org/show_bug.cgi?id=116152

Patch by Peter Gal <​galpeter@inf.u-szeged.hu> 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.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-15  Peter Gal  <galpeter@inf.u-szeged.hu>
+
+        [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  <ddkilzer@apple.com>
 

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

@@ -147 +147 @@
 void ResourceHandle::platformSetDefersLoading(bool defers)
 {
-#if LIBCURL_VERSION_NUM > 0x071200
     if (!d->m_handle)
         return;
@@ -162 +161 @@
             cancel();
     }
-#else
-    LOG_ERROR("Deferred loading is implemented if libcURL version is above 7.18.0");
-#endif
 }
 

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

@@ -211 +211 @@
         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;
@@ -254 +252 @@
         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;
@@ -339 +335 @@
         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)
@@ -620 +614 @@
     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);
@@ -688 +680 @@
     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);
@@ -695 +686 @@
         ASSERT_UNUSED(error, error == CURLE_OK);
     }
-#endif
 #ifndef NDEBUG
     if (getenv("DEBUG_CURL"))