Diff
Modified: trunk/Source/WebCore/ChangeLog (91153 => 91154)
--- trunk/Source/WebCore/ChangeLog 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebCore/ChangeLog 2011-07-16 22:59:48 UTC (rev 91154)
@@ -1,3 +1,16 @@
+2011-07-15 Pratik Solanki <psola...@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 <jber...@apple.com>
Work towards determining the cause of frequent crashes due to null frame below
Modified: trunk/Source/WebCore/WebCore.exp.in (91153 => 91154)
--- trunk/Source/WebCore/WebCore.exp.in 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-07-16 22:59:48 UTC (rev 91154)
@@ -1905,6 +1905,12 @@
#if USE(CFNETWORK)
__ZNK7WebCore13ResourceErrorcvP9__CFErrorEv
__ZN7WebCore12SchedulePairC1EP11__CFRunLoopPK10__CFString
+_wkCFURLRequestCopyHTTPRequestBodyParts
+_wkCFURLRequestSetHTTPRequestBodyParts
+_wkCopyCredentialFromCFPersistentStorage
+_wkGetDefaultHTTPCookieStorage
+_wkSetCFURLRequestShouldContentSniff
+_wkSetRequestStorageSession
#else
__ZNK7WebCore13ResourceErrorcvP7NSErrorEv
__ZN7WebCore12SchedulePairC1EP9NSRunLoopPK10__CFString
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (91153 => 91154)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-07-16 22:59:48 UTC (rev 91154)
@@ -67,6 +67,14 @@
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 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
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (91153 => 91154)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-07-16 22:59:48 UTC (rev 91154)
@@ -107,6 +107,15 @@
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)
Modified: trunk/Source/WebKit/mac/ChangeLog (91153 => 91154)
--- trunk/Source/WebKit/mac/ChangeLog 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-07-16 22:59:48 UTC (rev 91154)
@@ -1,3 +1,15 @@
+2011-07-15 Pratik Solanki <psola...@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_hor...@apple.com>
Overlay scrollbars in overflow areas no longer pulse when revealed
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (91153 => 91154)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2011-07-16 22:59:48 UTC (rev 91154)
@@ -162,6 +162,14 @@
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);
Modified: trunk/Source/WebKit2/ChangeLog (91153 => 91154)
--- trunk/Source/WebKit2/ChangeLog 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-16 22:59:48 UTC (rev 91154)
@@ -1,3 +1,15 @@
+2011-07-15 Pratik Solanki <psola...@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_hor...@apple.com>
Overlay scrollbars in overflow areas no longer pulse when revealed
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (91153 => 91154)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-07-16 22:59:48 UTC (rev 91154)
@@ -155,7 +155,15 @@
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);
Modified: trunk/WebKitLibraries/ChangeLog (91153 => 91154)
--- trunk/WebKitLibraries/ChangeLog 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/WebKitLibraries/ChangeLog 2011-07-16 22:59:48 UTC (rev 91154)
@@ -1,3 +1,17 @@
+2011-07-15 Pratik Solanki <psola...@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 <bfulg...@webkit.org>
Standardize WinCairo conditionalized code under PLATFORM macro.
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (91153 => 91154)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2011-07-16 22:39:31 UTC (rev 91153)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2011-07-16 22:59:48 UTC (rev 91154)
@@ -18,7 +18,11 @@
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,
WKCertificateParseResultFailed = 1,
@@ -220,6 +224,7 @@
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 @@
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 @@
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);
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
(Binary files differ)
