Diff
Modified: trunk/Source/WebCore/ChangeLog (89299 => 89300)
--- trunk/Source/WebCore/ChangeLog 2011-06-20 22:36:44 UTC (rev 89299)
+++ trunk/Source/WebCore/ChangeLog 2011-06-20 22:45:45 UTC (rev 89300)
@@ -1,3 +1,18 @@
+2011-06-20 Pratik Solanki <[email protected]>
+
+ Reviewed by David Kilzer.
+
+ HTTP pipelining functions on mac should match windows
+ https://bugs.webkit.org/show_bug.cgi?id=63012
+
+ Use a CFURLRequestRef instead of NSURLRequest for the HTTP pipelining functions.
+
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/network/mac/ResourceRequestMac.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+
2011-06-20 Ryosuke Niwa <[email protected]>
Fix bit flag collision.
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (89299 => 89300)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-06-20 22:36:44 UTC (rev 89299)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-06-20 22:45:45 UTC (rev 89300)
@@ -45,6 +45,7 @@
typedef struct __CFRunLoop * CFRunLoopRef;
typedef struct __CFHTTPMessage *CFHTTPMessageRef;
typedef struct _CFURLResponse *CFURLResponseRef;
+typedef const struct _CFURLRequest *CFURLRequestRef;
typedef const struct __CTLine * CTLineRef;
typedef const struct __CTTypesetter * CTTypesetterRef;
typedef const struct __AXUIElement *AXUIElementRef;
@@ -189,9 +190,9 @@
extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
-extern int (*wkGetHTTPPipeliningPriority)(NSURLRequest *);
+extern int (*wkGetHTTPPipeliningPriority)(CFURLRequestRef);
extern void (*wkSetHTTPPipeliningMaximumPriority)(int maximumPriority);
-extern void (*wkSetHTTPPipeliningPriority)(NSMutableURLRequest *, int priority);
+extern void (*wkSetHTTPPipeliningPriority)(CFURLRequestRef, int priority);
extern void (*wkSetHTTPPipeliningMinimumFastLanePriority)(int priority);
extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (89299 => 89300)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-06-20 22:36:44 UTC (rev 89299)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-06-20 22:45:45 UTC (rev 89300)
@@ -99,9 +99,9 @@
void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
id (*wkCreateNSURLConnectionDelegateProxy)(void);
unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
-int (*wkGetHTTPPipeliningPriority)(NSURLRequest *);
+int (*wkGetHTTPPipeliningPriority)(CFURLRequestRef);
void (*wkSetHTTPPipeliningMaximumPriority)(int priority);
-void (*wkSetHTTPPipeliningPriority)(NSMutableURLRequest *, int priority);
+void (*wkSetHTTPPipeliningPriority)(CFURLRequestRef, int priority);
void (*wkSetHTTPPipeliningMinimumFastLanePriority)(int priority);
void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
Modified: trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm (89299 => 89300)
--- trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2011-06-20 22:36:44 UTC (rev 89299)
+++ trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2011-06-20 22:45:45 UTC (rev 89300)
@@ -41,6 +41,7 @@
@interface NSURLRequest (WebNSURLRequestDetails)
- (NSArray *)contentDispositionEncodingFallbackArray;
+ (void)setDefaultTimeoutInterval:(NSTimeInterval)seconds;
+- (CFURLRequestRef)_CFURLRequest;
@end
@interface NSMutableURLRequest (WebMutableNSURLRequestDetails)
@@ -69,7 +70,7 @@
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
if (ResourceRequest::httpPipeliningEnabled())
- m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority(m_nsRequest.get()));
+ m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority([m_nsRequest.get() _CFURLRequest]));
#endif
NSDictionary *headers = [m_nsRequest.get() allHTTPHeaderFields];
@@ -116,7 +117,7 @@
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
if (ResourceRequest::httpPipeliningEnabled())
- wkSetHTTPPipeliningPriority(nsRequest, toHTTPPipeliningPriority(m_priority));
+ wkSetHTTPPipeliningPriority([nsRequest _CFURLRequest], toHTTPPipeliningPriority(m_priority));
#endif
[nsRequest setCachePolicy:(NSURLRequestCachePolicy)cachePolicy()];
Modified: trunk/WebKitLibraries/ChangeLog (89299 => 89300)
--- trunk/WebKitLibraries/ChangeLog 2011-06-20 22:36:44 UTC (rev 89299)
+++ trunk/WebKitLibraries/ChangeLog 2011-06-20 22:45:45 UTC (rev 89300)
@@ -1,3 +1,14 @@
+2011-06-20 Pratik Solanki <[email protected]>
+
+ Reviewed by David Kilzer.
+
+ HTTP pipelining functions on mac should match windows
+ https://bugs.webkit.org/show_bug.cgi?id=63012
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLeopard.a:
+ * libWebKitSystemInterfaceSnowLeopard.a:
+
2011-06-13 Tony Chang <[email protected]>
Reviewed by Dimitri Glazkov.
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (89299 => 89300)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2011-06-20 22:36:44 UTC (rev 89299)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2011-06-20 22:45:45 UTC (rev 89300)
@@ -17,6 +17,7 @@
#endif
typedef struct _CFURLResponse* CFURLResponseRef;
+typedef const struct _CFURLRequest* CFURLRequestRef;
typedef enum {
WKCertificateParseResultSucceeded = 0,
@@ -334,9 +335,9 @@
void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
-int WKGetHTTPPipeliningPriority(NSURLRequest *);
+int WKGetHTTPPipeliningPriority(CFURLRequestRef);
void WKSetHTTPPipeliningMaximumPriority(int maximumPriority);
-void WKSetHTTPPipeliningPriority(NSMutableURLRequest *, int priority);
+void WKSetHTTPPipeliningPriority(CFURLRequestRef, int priority);
void WKSetHTTPPipeliningMinimumFastLanePriority(int priority);
void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
(Binary files differ)
