[webkit-changes] [91102] trunk/Source/WebCore

Fri, 15 Jul 2011 13:35:23 -0700

Title: [91102] trunk/Source/WebCore
Revision
91102
Author
[email protected]
Date
2011-07-15 13:35:17 -0700 (Fri, 15 Jul 2011)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (91101 => 91102)


--- trunk/Source/WebCore/ChangeLog	2011-07-15 20:22:19 UTC (rev 91101)
+++ trunk/Source/WebCore/ChangeLog	2011-07-15 20:35:17 UTC (rev 91102)
@@ -1,3 +1,22 @@
+2011-07-15  Pratik Solanki  <[email protected]>
+
+        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  <[email protected]>
 
         REGRESSION: Mouse cursor doesn’t hide when full screen video HUD hides

Modified: trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp (91101 => 91102)


--- trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp	2011-07-15 20:22:19 UTC (rev 91101)
+++ trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp	2011-07-15 20:35:17 UTC (rev 91102)
@@ -37,13 +37,18 @@
 #include "FormData.h"
 #include <CFNetwork/CFURLRequestPriv.h>
 #include <CoreFoundation/CFStreamAbstract.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <sys/types.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
 #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
 #ifdef USE_V1_CFSTREAM_CALLBACKS
 typedef CFReadStreamCallBacksV1 WCReadStreamCallBacks;

Modified: trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp (91101 => 91102)


--- trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp	2011-07-15 20:22:19 UTC (rev 91101)
+++ trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp	2011-07-15 20:35:17 UTC (rev 91102)
@@ -31,10 +31,12 @@
 #include "KURL.h"
 #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 {
 
@@ -116,6 +118,8 @@
 {
 #if PLATFORM(WIN)
     errorCopy.m_certificate = m_certificate;
+#else
+    UNUSED_PARAM(errorCopy);
 #endif
 }

Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (91101 => 91102)


--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp	2011-07-15 20:22:19 UTC (rev 91101)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp	2011-07-15 20:35:17 UTC (rev 91102)
@@ -54,6 +54,7 @@
 #include "WebCoreSystemInterface.h"
 #include "WebCoreURLResponse.h"
 #include <CFNetwork/CFURLConnectionPriv.h>
+#include <CFNetwork/CFURLRequestPriv.h>
 #endif
 
 #if PLATFORM(WIN)
@@ -838,7 +839,7 @@
 {
     // 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();
         m_isDone = true;

Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (91101 => 91102)


--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp	2011-07-15 20:22:19 UTC (rev 91101)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp	2011-07-15 20:35:17 UTC (rev 91102)
@@ -72,7 +72,7 @@
 {
     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));
 }
 
 void ResourceResponse::platformLazyInit(InitLevel initLevel)

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to