Changeset 91102 in webkit

Timestamp:

Jul 15, 2011 1:35:17 PM (13 years ago)

Author:

psolanki@apple.com

Message:

Part of ​https://bugs.webkit.org/show_bug.cgi?id=63674
Get webkit to compile with USE(CFNETWORK) enabled on Mac

Reviewed by David Kilzer.

Minor changes needed to keep the compiler happy.

No new tests because no change in functionality.

• platform/network/cf/FormDataStreamCFNet.cpp:
• platform/network/cf/ResourceErrorCF.cpp:

(WebCore::ResourceError::platformCopy):

• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::WebCoreSynchronousLoaderClient::willSendRequest):

• platform/network/cf/ResourceResponseCFNet.cpp:

(WebCore::toTimeT):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/FormDataStreamCFNet.cpp (modified) (2 diffs)
• platform/network/cf/ResourceErrorCF.cpp (modified) (2 diffs)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (2 diffs)
• platform/network/cf/ResourceResponseCFNet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-15  Pratik Solanki  <psolanki@apple.com>
+
+        Part of https://bugs.webkit.org/show_bug.cgi?id=63674
+        Get webkit to compile with USE(CFNETWORK) enabled on Mac
+
+        Reviewed by David Kilzer.
+
+        Minor changes needed to keep the compiler happy.
+
+        No new tests because no change in functionality.
+
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        * platform/network/cf/ResourceErrorCF.cpp:
+        (WebCore::ResourceError::platformCopy):
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::WebCoreSynchronousLoaderClient::willSendRequest):
+        * platform/network/cf/ResourceResponseCFNet.cpp:
+        (WebCore::toTimeT):
+
 2011-07-15  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

@@ -38 +38 @@
 #include <CFNetwork/CFURLRequestPriv.h>
 #include <CoreFoundation/CFStreamAbstract.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <sys/types.h>
 #include <wtf/Assertions.h>
@@ -44 +43 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/text/CString.h>
+
+#if PLATFORM(MAC)
+#include "WebCoreSystemInterface.h"
+#elif PLATFORM(WIN)
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
 
 #define USE_V1_CFSTREAM_CALLBACKS

trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp

@@ -32 +32 @@
 #include <CoreFoundation/CFError.h>
 #include <CFNetwork/CFNetworkErrors.h>
+#include <wtf/RetainPtr.h>
+#include <wtf/UnusedParam.h>
+
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
-#include <WTF/RetainPtr.h>
 
 namespace WebCore {
@@ -117 +119 @@
 #if PLATFORM(WIN)
     errorCopy.m_certificate = m_certificate;
+#else
+    UNUSED_PARAM(errorCopy);
 #endif
 }

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -55 +55 @@
 #include "WebCoreURLResponse.h"
 #include <CFNetwork/CFURLConnectionPriv.h>
+#include <CFNetwork/CFURLRequestPriv.h>
 #endif
 
@@ -839 +840 @@
     // FIXME: This needs to be fixed to follow the redirect correctly even for cross-domain requests.
     if (!protocolHostAndPortAreEqual(handle->firstRequest().url(), request.url())) {
-        ASSERT(!m_error);
+        ASSERT(!m_error.cfError());
         RetainPtr<CFErrorRef> cfError(AdoptCF, CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainCFNetwork, kCFURLErrorBadServerResponse, 0));
         m_error = cfError.get();

trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp

@@ -73 +73 @@
     static const double maxTimeAsDouble = std::numeric_limits<time_t>::max();
     static const double minTimeAsDouble = std::numeric_limits<time_t>::min();
-    return min(max(minTimeAsDouble, time + kCFAbsoluteTimeIntervalSince1970), maxTimeAsDouble);
+    return static_cast<time_t>(min(max(minTimeAsDouble, time + kCFAbsoluteTimeIntervalSince1970), maxTimeAsDouble));
 }