Diff
Modified: trunk/Source/WebCore/ChangeLog (191139 => 191140)
--- trunk/Source/WebCore/ChangeLog 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/ChangeLog 2015-10-15 21:59:24 UTC (rev 191140)
@@ -1,3 +1,21 @@
+2015-10-15 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
+ https://bugs.webkit.org/show_bug.cgi?id=150189
+
+ Reviewed by Anders Carlsson.
+
+ * platform/ios/WebCoreSystemInterfaceIOS.mm: Removed definition.
+ * platform/mac/WebCoreSystemInterface.h: Removed declaration.
+ * platform/mac/WebCoreSystemInterface.mm: Removed definition.
+
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::start): Changed to use -[NSURLConnection setDefersLoading:].
+ (WebCore::ResourceHandle::platformSetDefersLoading): Ditto.
+
+ * platform/spi/cocoa/NSURLConnectionSPI.h: Added declaration of
+ -[NSURLConnection setDefersLoading:].
+
2015-10-15 Dean Jackson <d...@apple.com>
CSSKeyframesRule::appendRule is deprecated, but is actually the spec
Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (191139 => 191140)
--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2015-10-15 21:59:24 UTC (rev 191140)
@@ -38,7 +38,6 @@
WEBCORE_EXPORT CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
WEBCORE_EXPORT bool (*wkCGContextIsPDFContext)(CGContextRef);
WEBCORE_EXPORT NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
-WEBCORE_EXPORT void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
WEBCORE_EXPORT void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
WEBCORE_EXPORT id (*wkCreateNSURLConnectionDelegateProxy)(void);
WEBCORE_EXPORT unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (191139 => 191140)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-10-15 21:59:24 UTC (rev 191140)
@@ -197,7 +197,6 @@
extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
#endif
-extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
extern void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform);
extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (191139 => 191140)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-10-15 21:59:24 UTC (rev 191140)
@@ -81,7 +81,6 @@
void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
bool (*wkCGContextIsPDFContext)(CGContextRef);
-void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (191139 => 191140)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-10-15 21:59:24 UTC (rev 191140)
@@ -297,7 +297,7 @@
if (d->m_connection) {
if (d->m_defersLoading)
- wkSetNSURLConnectionDefersCallbacks(connection(), YES);
+ connection().defersCallbacks = YES;
return true;
}
@@ -321,7 +321,7 @@
void ResourceHandle::platformSetDefersLoading(bool defers)
{
if (d->m_connection)
- wkSetNSURLConnectionDefersCallbacks(d->m_connection.get(), defers);
+ [d->m_connection setDefersCallbacks:defers];
}
#if PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h (191139 => 191140)
--- trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h 2015-10-15 21:59:24 UTC (rev 191140)
@@ -31,6 +31,7 @@
@interface NSURLConnection ()
+ (CFRunLoopRef)resourceLoaderRunLoop;
+- (void)setDefersCallbacks:(BOOL)defers;
@end
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (191139 => 191140)
--- trunk/Source/WebKit/mac/ChangeLog 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-15 21:59:24 UTC (rev 191140)
@@ -1,3 +1,13 @@
+2015-10-15 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
+ https://bugs.webkit.org/show_bug.cgi?id=150189
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Removed initialization.
+
2015-10-14 Zhuo Li <zac...@apple.com>
Augment <input type=search>’s recent search history with the time each entry was added,
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (191139 => 191140)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-10-15 21:59:24 UTC (rev 191140)
@@ -94,7 +94,6 @@
INIT(SetHTTPRequestPriority);
INIT(SetHTTPRequestMinimumFastLanePriority);
INIT(HTTPRequestEnablePipelining);
- INIT(SetNSURLConnectionDefersCallbacks);
INIT(SetNSURLRequestShouldContentSniff);
INIT(SetPatternPhaseInUserSpace);
INIT(CGContextIsPDFContext);
Modified: trunk/Source/WebKit2/ChangeLog (191139 => 191140)
--- trunk/Source/WebKit2/ChangeLog 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 21:59:24 UTC (rev 191140)
@@ -1,3 +1,13 @@
+2015-10-15 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
+ https://bugs.webkit.org/show_bug.cgi?id=150189
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Removed initialization.
+
2015-10-15 Anders Carlsson <ander...@apple.com>
Fix build.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (191139 => 191140)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-10-15 21:59:24 UTC (rev 191140)
@@ -100,7 +100,6 @@
INIT(SetHTTPRequestMaximumPriority);
INIT(SetHTTPRequestPriority);
INIT(SetHTTPRequestMinimumFastLanePriority);
- INIT(SetNSURLConnectionDefersCallbacks);
INIT(SetNSURLRequestShouldContentSniff);
INIT(SetPatternPhaseInUserSpace);
INIT(CreatePrivateStorageSession);
