Title: [91084] trunk/Source/WebCore
- Revision
- 91084
- Author
- [email protected]
- Date
- 2011-07-15 11:52:51 -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.
No new tests because no change in functionality and option is not enabled on Mac.
* platform/network/cf/AuthenticationCF.h: Just use AuthenticationMac.h instead of having
Mac-specific declarations here.
* platform/network/cf/CredentialStorageCFNet.cpp:
* platform/network/mac/AuthenticationMac.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91083 => 91084)
--- trunk/Source/WebCore/ChangeLog 2011-07-15 18:51:35 UTC (rev 91083)
+++ trunk/Source/WebCore/ChangeLog 2011-07-15 18:52:51 UTC (rev 91084)
@@ -5,6 +5,20 @@
Reviewed by David Kilzer.
+ No new tests because no change in functionality and option is not enabled on Mac.
+
+ * platform/network/cf/AuthenticationCF.h: Just use AuthenticationMac.h instead of having
+ Mac-specific declarations here.
+ * platform/network/cf/CredentialStorageCFNet.cpp:
+ * platform/network/mac/AuthenticationMac.h:
+
+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.
+
Get LoaderRunLoop to work on Mac when USE(CFNETWORK) is enabled. Although we could use the
main run loop, it's better to have a separate thread handling the loads so that it can work
in parallel to the main thread. This is similar to what NSURLConnection does for us
Modified: trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h (91083 => 91084)
--- trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h 2011-07-15 18:51:35 UTC (rev 91083)
+++ trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h 2011-07-15 18:52:51 UTC (rev 91084)
@@ -28,16 +28,6 @@
#if USE(CFNETWORK)
-#ifdef __OBJC__
-@class NSURLAuthenticationChallenge;
-@class NSURLCredential;
-@class NSURLProtectionSpace;
-#else
-class NSURLAuthenticationChallenge;
-class NSURLCredential;
-class NSURLProtectionSpace;
-#endif
-
#include <CFNetwork/CFURLCredentialPriv.h>
typedef struct _CFURLAuthChallenge* CFURLAuthChallengeRef;
@@ -59,16 +49,6 @@
Credential core(CFURLCredentialRef);
ProtectionSpace core(CFURLProtectionSpaceRef);
-#if PLATFORM(MAC)
-AuthenticationChallenge core(NSURLAuthenticationChallenge *);
-Credential core(NSURLCredential *);
-ProtectionSpace core(NSURLProtectionSpace*);
-
-NSURLAuthenticationChallenge *mac(const AuthenticationChallenge&);
-NSURLCredential *mac(const Credential&);
-NSURLProtectionSpace *mac(const ProtectionSpace&);
-#endif
-
}
#endif // USE(CFNETWORK)
Modified: trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp (91083 => 91084)
--- trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2011-07-15 18:51:35 UTC (rev 91083)
+++ trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2011-07-15 18:52:51 UTC (rev 91084)
@@ -31,9 +31,14 @@
#include "AuthenticationCF.h"
#include "Credential.h"
#include "ProtectionSpace.h"
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <wtf/RetainPtr.h>
+#if PLATFORM(MAC)
+#include "WebCoreSystemInterface.h"
+#elif PLATFORM(WIN)
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
+
namespace WebCore {
Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
Modified: trunk/Source/WebCore/platform/network/mac/AuthenticationMac.h (91083 => 91084)
--- trunk/Source/WebCore/platform/network/mac/AuthenticationMac.h 2011-07-15 18:51:35 UTC (rev 91083)
+++ trunk/Source/WebCore/platform/network/mac/AuthenticationMac.h 2011-07-15 18:52:51 UTC (rev 91084)
@@ -25,8 +25,6 @@
#ifndef AuthenticationMac_h
#define AuthenticationMac_h
-#if !USE(CFNETWORK)
-
#ifdef __OBJC__
@class NSURLAuthenticationChallenge;
@@ -50,6 +48,4 @@
}
#endif // __OBJC__
-#endif // !USE(CFNETWORK)
-
#endif // AuthenticationMac_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
