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.

New WebKitSystemInterface functions for CFNetwork-based loader.

../../git/opensource/WebKit.git/Source/WebCore:

* WebCore.exp.in:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:

../../git/opensource/WebKit.git/Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface):

../../git/opensource/WebKit.git/Source/WebKit2:

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):

../../git/opensource/WebKit.git/WebKitLibraries:

* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceSnowLeopard.a:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1ecc15f997c75b12f2cddbd197a72686894c9cd6..ab7bb402a78a14c03164bfcd3f4488a20e557d67 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
+        New WebKitSystemInterface functions for CFNetwork-based loader.
+
+        * WebCore.exp.in:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2011-07-16  Jessie Berlin  <jberlin@apple.com>
 
         Work towards determining the cause of frequent crashes due to null frame below

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index b9a245113afe23ba040ea2d142191618ae3af80d..35320ff6975326467a748bb5edf6f11c1ac6bdf5 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1905,6 +1905,12 @@ __ZN7WebCore8Settings20gAVFoundationEnabledE
 #if USE(CFNETWORK)
 __ZNK7WebCore13ResourceErrorcvP9__CFErrorEv
 __ZN7WebCore12SchedulePairC1EP11__CFRunLoopPK10__CFString
+_wkCFURLRequestCopyHTTPRequestBodyParts
+_wkCFURLRequestSetHTTPRequestBodyParts
+_wkCopyCredentialFromCFPersistentStorage
+_wkGetDefaultHTTPCookieStorage
+_wkSetCFURLRequestShouldContentSniff
+_wkSetRequestStorageSession
 #else
 __ZNK7WebCore13ResourceErrorcvP7NSErrorEv
 __ZN7WebCore12SchedulePairC1EP9NSRunLoopPK10__CFString

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
index 76524712734d02262196d2d58b9ae6ad7c1fa996..dc9da9bc75067e38a147db40a62f0ef10ffde577 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -67,6 +67,14 @@ typedef struct _NSPoint NSPoint;
 typedef struct _NSRect NSRect;
 #endif
 
+#if USE(CFNETWORK)
+typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
+typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
+typedef struct _CFURLCredential* WKCFURLCredentialRef;
+typedef struct _CFURLRequest* CFMutableURLRequestRef;
+typedef const struct _CFURLRequest* CFURLRequestRef;
+#endif
+
 #ifdef __OBJC__
 @class AVAsset;
 @class NSArray;
@@ -330,6 +338,15 @@ extern CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
 extern CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
 extern CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
 extern void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
+
+#if USE(CFNETWORK)
+extern CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
+extern WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
+extern void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
+extern CFArrayRef (*wkCFURLRequestCopyHTTPRequestBodyParts)(CFURLRequestRef);
+extern void (*wkCFURLRequestSetHTTPRequestBodyParts)(CFMutableURLRequestRef, CFArrayRef bodyParts);
+extern void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
+#endif
 }
 
 #endif

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
index e55fa11829827a16d37bf1bd44e06a3304ac2c8a..1c828fbdd57189835ca018144f3be69785fb09f6 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -107,6 +107,15 @@ void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNum
 void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL);
 
+#if USE(CFNETWORK)
+CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
+WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
+void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
+CFArrayRef (*wkCFURLRequestCopyHTTPRequestBodyParts)(CFURLRequestRef);
+void (*wkCFURLRequestSetHTTPRequestBodyParts)(CFMutableURLRequestRef, CFArrayRef bodyParts);
+void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
+#endif
+
 void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
 
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 388899440a3f49909c65aa6c4c6417b76f146ec6..19dc79e7292e3ec4cdfe022b89b7ef0cee764c21 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
+        New WebKitSystemInterface functions for CFNetwork-based loader.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2011-07-15  Tim Horton  <timothy_horton@apple.com>
 
         Overlay scrollbars in overflow areas no longer pulse when revealed

diff --git a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
index f5cc69df3fbd050dc03250dc52c5de464b057e03..69b734253ea4e1057bfc05eb48bbc3979fd07c6f 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
@@ -162,6 +162,14 @@ void InitWebCoreSystemInterface(void)
     INIT(AVAssetResolvedURL);
     INIT(Cursor);
 #endif
+#if USE(CFNETWORK)
+    INIT(GetDefaultHTTPCookieStorage);
+    INIT(CopyCredentialFromCFPersistentStorage);
+    INIT(SetCFURLRequestShouldContentSniff);
+    INIT(CFURLRequestCopyHTTPRequestBodyParts);
+    INIT(CFURLRequestSetHTTPRequestBodyParts);
+    INIT(SetRequestStorageSession);
+#endif
 
     INIT(GetAXTextMarkerTypeID);
     INIT(GetAXTextMarkerRangeTypeID);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d3f69712f209029617eface231d667d156803e56..163880e200497d5b984fbb63733efd0c0c80424e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
+        New WebKitSystemInterface functions for CFNetwork-based loader.
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2011-07-15  Tim Horton  <timothy_horton@apple.com>
 
         Overlay scrollbars in overflow areas no longer pulse when revealed

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
index a390b2bb0be5e5a63fe715c56b7fc9033b590198..5cf81e9f8e44c34a504aead30efd34dc4d7a08ea 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
@@ -155,7 +155,15 @@ void InitWebCoreSystemInterface(void)
         INIT(GetHyphenationLocationBeforeIndex);
         INIT(GetNSEventMomentumPhase);
 #endif
-        
+#if USE(CFNETWORK)
+        INIT(GetDefaultHTTPCookieStorage);
+        INIT(CopyCredentialFromCFPersistentStorage);
+        INIT(SetCFURLRequestShouldContentSniff);
+        INIT(CFURLRequestCopyHTTPRequestBodyParts);
+        INIT(CFURLRequestSetHTTPRequestBodyParts);
+        INIT(SetRequestStorageSession);
+#endif
+
         INIT(GetAXTextMarkerTypeID);
         INIT(GetAXTextMarkerRangeTypeID);
         INIT(CreateAXTextMarker);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 54ad4963ced968314a93910ec0fb442f72967c81..7f5ef331b020fe5897c72ad290f37124c2c43b26 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,17 @@
+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.
+
+        New WebKitSystemInterface functions for CFNetwork-based loader.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
 2011-07-12  Brent Fulgham  <bfulgham@webkit.org>
 
         Standardize WinCairo conditionalized code under PLATFORM macro.

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 84bd2870ce998b6b20a0ca68afb4a40e642deeb4..16de2d3a277fc493cb957b5a1d330d26b15c74b0 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -18,6 +18,10 @@ extern "C" {
 
 typedef struct _CFURLResponse* CFURLResponseRef;
 typedef const struct _CFURLRequest* CFURLRequestRef;
+typedef struct _CFURLRequest* CFMutableURLRequestRef;
+
+typedef struct _CFURLCredential* WKCFURLCredentialRef;
+typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
 
 typedef enum {
     WKCertificateParseResultSucceeded  = 0,
@@ -220,6 +224,7 @@ typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 CFURLStorageSessionRef WKCreatePrivateStorageSession(CFStringRef);
 NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest*);
 NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest*);
+void WKSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef);
 
 typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
 CFHTTPCookieStorageRef WKCopyHTTPCookieStorage(CFURLStorageSessionRef);
@@ -228,6 +233,12 @@ NSArray *WKHTTPCookiesForURL(CFHTTPCookieStorageRef, NSURL *);
 void WKSetHTTPCookiesForURL(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
 void WKDeleteHTTPCookie(CFHTTPCookieStorageRef, NSHTTPCookie *);
 
+CFHTTPCookieStorageRef WKGetDefaultHTTPCookieStorage(void);
+WKCFURLCredentialRef WKCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef);
+void WKSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool flag);
+CFArrayRef WKCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef);
+void WKCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts);
+
 void WKSetVisibleApplicationName(CFStringRef);
 
 typedef enum {
@@ -412,6 +423,7 @@ typedef struct __WKScrollbarPainterController *WKScrollbarPainterControllerRef;
 WKScrollbarPainterRef WKMakeScrollbarPainter(int controlSize, bool isHorizontal);
 WKScrollbarPainterRef WKMakeScrollbarReplacementPainter(WKScrollbarPainterRef oldPainter, int newStyle, int controlSize, bool isHorizontal);
 void WKScrollbarPainterSetDelegate(WKScrollbarPainterRef, id scrollbarPainterDelegate);
+void WKScrollbarPainterSetEnabled(WKScrollbarPainterRef scrollbarPainter, bool enabled);
 void WKScrollbarPainterPaint(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, CGRect frameRect);
 void WKScrollbarPainterForceFlashScrollers(WKScrollbarPainterControllerRef);
 int WKScrollbarThickness(int controlSize);

diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 4337727f374c49b75dbba6390b780ab9814b92ea..f15626ed17ae497dc3d929aa895e1e14cf138a1a 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceLion.a b/WebKitLibraries/libWebKitSystemInterfaceLion.a
index d44c9444888093fb4fd13523d0558fbc797eb8f0..4796b38056168cd7e2522a76391b29550ba9b0d5 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLion.a and b/WebKitLibraries/libWebKitSystemInterfaceLion.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index 25e737ebbd6af7ed542e052b3e46f822c8acedef..f7426d14474ae8860d0169d767db86e8f3a90386 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ