Attachment 348383 Details for Bug 189072 – Patch

[patch] Patch

bug-189072-20180828203439.patch (text/plain), 26.44 KB, created by Darin Adler on 2018-08-28 20:34:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Adler

Created: 2018-08-28 20:34:40 PDT

Size: 26.44 KB

patch

obsolete

>Subversion Revision: 235453
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 02ef10ba4ae75b651b342c413e0e3b470fccf380..f02b35becfda86a28417f7e7912ef144c8335f0f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-28  Darin Adler  <darin@apple.com>
>+
>+        [CFNetwork] Update CFNetwork SPI use to use CFNetworkSPI.h more consistently
>+        https://bugs.webkit.org/show_bug.cgi?id=189072
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/mac/WebCoreNSURLExtras.mm: Include CFNetworkSPI.h and remove a
>+        declaration of +[NSURLProtocol _protocolClassForRequest:].
>+
>+        * platform/network/mac/ResourceHandleMac.mm: Remove a declaration of
>+        -[NSURLConnection _initWithRequest:delegate:usesCache:maxContentLength:startImmediately:connectionProperties:].
>+        (WebCore::ResourceHandle::createNSURLConnection): Add ignore of
>+        "-Wdeprecated-declarations" around use of the above method, since it
>+        is deprecated.
>+
> 2018-08-28  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Work towards: [iOS] Consolidate the implementations of readString, stringForType, and readURL in PlatformPasteboardIOS.mm
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 42825d3baf6ec4c210baf543232570a8a7415c4f..324619134e72a9b524948b52fe741a98a603a10f 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-28  Darin Adler  <darin@apple.com>
>+
>+        [CFNetwork] Update CFNetwork SPI use to use CFNetworkSPI.h more consistently
>+        https://bugs.webkit.org/show_bug.cgi?id=189072
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h: Added a FIXME about USE(CFNETWORK_IGNORE_HSTS).
>+        Sorted Objective-C class interfaces alphabetically instead of having them
>+        relatively randomly ordered in the file. Reduced the platform #if statements
>+        since it's not critical to have these SPIs declared only where they are
>+        present, as long as they are used only when they are present. Moved some
>+        additional declarations into this file.
>+
>+        * pal/spi/cocoa/NSURLDownloadSPI.h: Added more NSURLDownload methods.
>+
> 2018-08-27  Keith Rollin  <krollin@apple.com>
> 
>         Unreviewed build fix -- disable LTO for production builds
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index dc7c6c731c3bf075e5b37877668bf889c99c3e62..82961ebae13a63b188c7bfced94b97e23af365fa 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-28  Darin Adler  <darin@apple.com>
>+
>+        [CFNetwork] Update CFNetwork SPI use to use CFNetworkSPI.h more consistently
>+        https://bugs.webkit.org/show_bug.cgi?id=189072
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: Removed NSURLSessionTask
>+        method declarations from this file, they are in CFNetworkSPI.h.
>+
>+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm: Removed NSURLSessionConfiguration
>+        method declarations from this file, they are in CFNetworkSPI.h.
>+
> 2018-08-28  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Work towards: [iOS] Consolidate the implementations of readString, stringForType, and readURL in PlatformPasteboardIOS.mm
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index d8a4e4c5068611caf4903c3c77c756ba4cb64a5c..a407358ab7023d064f215a755bb289afde86e0db 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-28  Darin Adler  <darin@apple.com>
>+
>+        [CFNetwork] Update CFNetwork SPI use to use CFNetworkSPI.h more consistently
>+        https://bugs.webkit.org/show_bug.cgi?id=189072
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Misc/WebDownload.mm: Removed forward declaration of NSURLConnectionDelegateProxy
>+        and declarations for NSURLDownload init methods.
>+
>+        * Misc/WebDownloadInternal.h: Removed.
>+
>+        * WebCoreSupport/WebFrameLoaderClient.mm: Removed include of WebDownloadInternal.h.
>+        (WebFrameLoaderClient::convertMainResourceLoadToDownload): Ignore
>+        "-Wdeprecated-declarations" because the method used here is deprecated.
>+
>+        * WebView/WebView.mm:
>+        (-[WebView _downloadURL:]): Ignore "-Wdeprecated-declarations" because the method
>+        used here is deprecated.
>+
> 2018-08-28  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Work towards: [iOS] Consolidate the implementations of readString, stringForType, and readURL in PlatformPasteboardIOS.mm
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index 3dc2950aad8b4aa2ad6b1780b94f7a2508318ef3..cf1481e1561be7b93c682aa8315f08f3c957472a 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -30,6 +30,10 @@
> #include <CFNetwork/CFNetwork.h>
> #include <pal/spi/cf/CFNetworkConnectionCacheSPI.h>
> 
>+// FIXME: Policy about which CFNetwork features to *use* in WebKit does not belong in the SPI header.
>+// The SPI header should define which CFNetwork features *exist* in the underlying system, but not
>+// policy about what WebKit should do. Accordingly, we should move this somewhere else or rename it
>+// to be about CFNetwork capabilities (HAVE) rather than about WebKit policy (USE).
> #if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40200) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 110200))
> #define USE_CFNETWORK_IGNORE_HSTS 1
> #endif
>@@ -87,10 +91,51 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> 
> #if defined(__OBJC__)
> 
>+@class NSURLConnectionDelegateProxy;
>+
> @interface NSURLCache ()
> - (CFURLCacheRef)_CFURLCache;
> @end
> 
>+@interface NSCachedURLResponse ()
>+- (id)_initWithCFCachedURLResponse:(CFCachedURLResponseRef)cachedResponse;
>+- (CFCachedURLResponseRef)_CFCachedURLResponse;
>+@end
>+
>+@interface NSHTTPCookie ()
>+- (CFHTTPCookieRef)_CFHTTPCookie;
>++ (CFArrayRef __nullable)_ns2cfCookies:(NSArray * __nullable)nsCookies CF_RETURNS_RETAINED;
>+- (CFHTTPCookieRef __nullable)_GetInternalCFHTTPCookie;
>+@property (nullable, readonly, copy) NSString *_storagePartition;
>+@end
>+
>+@interface NSHTTPCookieStorage ()
>+- (id)_initWithIdentifier:(NSString *)identifier private:(bool)isPrivate;
>+- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition completionHandler:(void (^)(NSArray *))completionHandler;
>+- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition policyProperties:(NSDictionary*)props completionHandler:(void (^)(NSArray *))completionHandler;
>+- (void)_setCookies:(NSArray *)cookies forURL:(NSURL *)URL mainDocumentURL:(NSURL *)mainDocumentURL policyProperties:(NSDictionary*) props;
>+- (void)removeCookiesSinceDate:(NSDate *)date;
>+- (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
>+- (CFHTTPCookieStorageRef)_cookieStorage;
>+- (void)_saveCookies;
>+- (void)_saveCookies:(dispatch_block_t) completionHandler;
>+@end
>+
>+@interface NSURLConnection ()
>+- (id)_initWithRequest:(NSURLRequest *)request delegate:(id)delegate usesCache:(BOOL)usesCacheFlag maxContentLength:(long long)maxContentLength startImmediately:(BOOL)startImmediately connectionProperties:(NSDictionary *)connectionProperties;
>+@end
>+
>+@interface NSMutableURLRequest ()
>+- (void)setContentDispositionEncodingFallbackArray:(NSArray *)theEncodingFallbackArray;
>+- (void)setBoundInterfaceIdentifier:(NSString *)identifier;
>+- (void)_setPreventHSTSStorage:(BOOL)preventHSTSStorage;
>+- (void)_setIgnoreHSTS:(BOOL)ignoreHSTS;
>+@end
>+
>+@interface NSURLProtocol ()
>++ (Class)_protocolClassForRequest:(NSURLRequest *)request;
>+@end
>+
> @interface NSURLRequest ()
> + (NSArray *)allowsSpecificHTTPSCertificateForHost:(NSString *)host;
> + (void)setAllowsSpecificHTTPSCertificate:(NSArray *)allow forHost:(NSString *)host;
>@@ -100,20 +145,9 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> - (id)_initWithCFURLRequest:(CFURLRequestRef)request;
> - (id)_propertyForKey:(NSString *)key;
> - (void)_setProperty:(id)value forKey:(NSString *)key;
>-#if USE(CFNETWORK_IGNORE_HSTS)
> - (BOOL)_schemeWasUpgradedDueToDynamicHSTS;
> - (BOOL)_preventHSTSStorage;
> - (BOOL)_ignoreHSTS;
>-#endif
>-@end
>-
>-@interface NSMutableURLRequest ()
>-- (void)setContentDispositionEncodingFallbackArray:(NSArray *)theEncodingFallbackArray;
>-- (void)setBoundInterfaceIdentifier:(NSString *)identifier;
>-#if USE(CFNETWORK_IGNORE_HSTS)
>-- (void)_setPreventHSTSStorage:(BOOL)preventHSTSStorage;
>-- (void)_setIgnoreHSTS:(BOOL)ignoreHSTS;
>-#endif
> @end
> 
> @interface NSURLResponse ()
>@@ -122,12 +156,6 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> - (NSDate *)_lastModifiedDate;
> @end
> 
>-@interface NSHTTPCookie ()
>-- (CFHTTPCookieRef)_CFHTTPCookie;
>-+ (CFArrayRef __nullable)_ns2cfCookies:(NSArray * __nullable)nsCookies CF_RETURNS_RETAINED;
>-- (CFHTTPCookieRef __nullable)_GetInternalCFHTTPCookie;
>-@end
>-
> @interface NSURLSessionConfiguration ()
> @property (assign) _TimingDataOptions _timingDataOptions;
> @property (copy) NSData *_sourceApplicationAuditTokenData;
>@@ -140,8 +168,16 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
> @property (nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders;
> #endif
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>-@property (copy) NSDictionary *_socketStreamProperties;
>+@end
>+
>+@interface NSURLSessionTask ()
>+- (NSDictionary *)_timingData;
>+@property (readwrite, copy) NSString *_pathToDownloadTaskFile;
>+@property (copy) NSString *_storagePartitionIdentifier;
>+@property (nullable, readwrite, retain) NSURL *_siteForCookies;
>+@property (readwrite) BOOL _isTopLevelNavigation;
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
>+@property (nonatomic, assign) BOOL _preconnect;
> #endif
> @end
> 
>@@ -156,28 +192,6 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> @end
> #endif
> 
>-@interface NSHTTPCookie ()
>-@property (nullable, readonly, copy) NSString *_storagePartition;
>-@end
>-
>-@interface NSHTTPCookieStorage ()
>-- (id)_initWithIdentifier:(NSString *)identifier private:(bool)isPrivate;
>-- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition completionHandler:(void (^)(NSArray *))completionHandler;
>-- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition policyProperties:(NSDictionary*)props completionHandler:(void (^)(NSArray *))completionHandler;
>-- (void)_setCookies:(NSArray *)cookies forURL:(NSURL *)URL mainDocumentURL:(NSURL *)mainDocumentURL policyProperties:(NSDictionary*) props;
>-@end
>-
>-@interface NSURLSessionTask ()
>-- (NSDictionary *)_timingData;
>-@property (readwrite, copy) NSString *_pathToDownloadTaskFile;
>-@property (copy) NSString *_storagePartitionIdentifier;
>-@property (nullable, readwrite, retain) NSURL *_siteForCookies;
>-@property (readwrite) BOOL _isTopLevelNavigation;
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
>-@property (nonatomic, assign) BOOL _preconnect;
>-#endif
>-@end
>-
> extern NSString * const NSURLAuthenticationMethodOAuth;
> 
> #endif // defined(__OBJC__)
>@@ -285,11 +299,6 @@ enum : NSUInteger {
>     NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
> };
> 
>-@interface NSCachedURLResponse ()
>--(id)_initWithCFCachedURLResponse:(CFCachedURLResponseRef)cachedResponse;
>--(CFCachedURLResponseRef)_CFCachedURLResponse;
>-@end
>-
> #endif
> 
> WTF_EXTERN_C_BEGIN
>@@ -314,6 +323,9 @@ WTF_EXTERN_C_END
> 
> #if defined(__OBJC__)
> 
>+// FIXME: Move these declarations the above section under !USE(APPLE_INTERNAL_SDK) when possible so that
>+// Apple internal SDK builds use headers instead.
>+
> @interface NSHTTPCookie ()
> #if PLATFORM(MAC)
> + (NSArray *)_parsedCookiesWithResponseHeaderFields:(NSDictionary *)headerFields forURL:(NSURL *)aURL;
>@@ -321,17 +333,6 @@ WTF_EXTERN_C_END
> + (NSArray *)_cf2nsCookies:(CFArrayRef)cfCookies;
> @end
> 
>-#if !USE(APPLE_INTERNAL_SDK)
>-@interface NSHTTPCookieStorage ()
>-- (void)removeCookiesSinceDate:(NSDate *)date;
>-- (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
>-- (CFHTTPCookieStorageRef)_cookieStorage;
>-- (void)_saveCookies;
>-- (void)_saveCookies:(dispatch_block_t) completionHandler;
>-@end
>-#endif
>-
>-// FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
> @interface NSHTTPCookieStorage ()
> + (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
> @end
>@@ -340,4 +341,15 @@ WTF_EXTERN_C_END
> - (void)_setMIMEType:(NSString *)type;
> @end
> 
>+@interface NSURLSessionConfiguration ()
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>+// FIXME: Remove this once rdar://problem/40650244 is in a build.
>+@property (copy) NSDictionary *_socketStreamProperties;
>+#endif
>+@end
>+
>+@interface NSURLSessionTask ()
>+- (void)_setExplicitCookieStorage:(CFHTTPCookieStorageRef)storage;
>+@end
>+
> #endif // defined(__OBJC__)
>diff --git a/Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h
>index bad82de021430e0804b50e1999d2062a322449eb..5aedf0457bc310415a21e57b8fc6777994a9c0c6 100644
>--- a/Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h
>@@ -25,18 +25,12 @@
> 
> #pragma once
> 
>-#import <Foundation/NSObject.h>
>-
> #if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
> 
> #import <Foundation/NSURLDownload.h>
> 
> #if USE(APPLE_INTERNAL_SDK)
> #import <Foundation/NSURLDownloadPrivate.h>
>-#else
>-@interface NSURLDownload ()
>-+(id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)response delegate:(id)delegate proxy:(id)proxy;
>-@end
> #endif
> 
> #else
>@@ -48,6 +42,12 @@
> @class NSURLRequest;
> @class NSURLResponse;
> 
>+#ifndef WebDownload_h
>+/* Also defined in <WebKit/WebDownload.h>. */
>+@interface NSURLDownload : NSObject
>+@end
>+#endif
>+
> @protocol NSURLDownloadDelegate <NSObject>
> @optional
> - (void)downloadDidBegin:(NSURLDownload *)download;
>@@ -65,12 +65,6 @@
> - (void)download:(NSURLDownload *)download didFailWithError:(NSError *)error;
> @end
> 
>-#ifndef WebDownload_h
>-/* Also defined in <WebKit/WebDownload.h>. */
>-@interface NSURLDownload : NSObject
>-@end
>-#endif
>-
> @interface NSURLDownload ()
> - (instancetype)initWithRequest:(NSURLRequest *)request delegate:(id <NSURLDownloadDelegate>)delegate;
> - (instancetype)initWithResumeData:(NSData *)resumeData delegate:(id <NSURLDownloadDelegate>)delegate path:(NSString *)path;
>@@ -79,8 +73,17 @@
> @property (readonly, copy) NSURLRequest *request;
> @property (readonly, copy) NSData *resumeData;
> @property BOOL deletesFileUponFailure;
>+@end
>+
>+#endif
> 
>-+(id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)response delegate:(id)delegate proxy:(id)proxy;
>+#if !USE(APPLE_INTERNAL_SDK)
>+
>+@interface NSURLDownload ()
>++ (id)_downloadWithRequest:(NSURLRequest *)request delegate:(id)delegate directory:(NSString *)directory;
>++ (id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)response delegate:(id)delegate proxy:(id)proxy;
>+- (id)_initWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy;
>+- (id)_initWithRequest:(NSURLRequest *)request delegate:(id)delegate directory:(NSString *)directory;
> @end
> 
> #endif
>diff --git a/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm b/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
>index ec64ea91cf72aa5256c9a56aee3262f82edb00fb..e45fdaa43b00be0be145aeecf7fce3ef97ef5ecb 100644
>--- a/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
>+++ b/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
>@@ -29,6 +29,7 @@
> #import "config.h"
> #import "URLParser.h"
> #import "WebCoreNSURLExtras.h"
>+#import <pal/spi/cf/CFNetworkSPI.h>
> #import <wtf/Function.h>
> #import <wtf/HexNumber.h>
> #import <wtf/ObjcRuntimeExtras.h>
>@@ -47,11 +48,6 @@ typedef void (* StringRangeApplierFunction)(NSString *string, NSRange range, voi
> 
> static uint32_t IDNScriptWhiteList[(USCRIPT_CODE_LIMIT + 31) / 32];
> 
>-
>-@interface NSURLProtocol (WKNSURLProtocolInternal)
>-+ (Class)_protocolClassForRequest:(NSURLRequest *)request;
>-@end
>-
> namespace WebCore {
> 
> static bool isArmenianLookalikeCharacter(UChar32 codePoint)
>diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
>index 1d7b6e78742ee17866907e54d625481274ca9054..b9fc2a2f17cd9574004cbb97499aabd1166e073b 100644
>--- a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
>+++ b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
>@@ -63,10 +63,6 @@
> 
> using namespace WebCore;
> 
>-@interface NSURLConnection ()
>--(id)_initWithRequest:(NSURLRequest *)request delegate:(id)delegate usesCache:(BOOL)usesCacheFlag maxContentLength:(long long)maxContentLength startImmediately:(BOOL)startImmediately connectionProperties:(NSDictionary *)connectionProperties;
>-@end
>-
> namespace WebCore {
>     
> static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
>@@ -224,7 +220,10 @@ void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredential
>     // web content for purposes of App Transport Security.
>     [propertyDictionary setObject:@{@"NSAllowsArbitraryLoadsInWebContent": @YES} forKey:@"_kCFURLConnectionPropertyATSFrameworkOverrides"];
> 
>+#pragma clang diagnostic push
>+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
>     d->m_connection = adoptNS([[NSURLConnection alloc] _initWithRequest:nsRequest delegate:delegate usesCache:usesCache maxContentLength:0 startImmediately:NO connectionProperties:propertyDictionary]);
>+#pragma clang diagnostic pop
> }
> 
> bool ResourceHandle::start()
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>index fc209c8f71397e1728c152379937b28b9f4c1d2f..c2d45d66bd258eb832c254feb835aade6713e945 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>@@ -45,26 +45,10 @@
> #import <wtf/ProcessPrivilege.h>
> #import <wtf/text/Base64.h>
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>-@interface NSURLSessionTask (Staging)
>-@property (readwrite, retain) NSURL *_siteForCookies;
>-@property (readwrite) BOOL _isTopLevelNavigation;
>-@end
>-#endif
>-
> #if HAVE(NW_ACTIVITY)
> #import <CFNetwork/CFNSURLConnection.h>
> #endif
> 
>-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-
>-// FIXME: Move to CFNetworkSPI.h?
>-@interface NSURLSessionTask ()
>-- (void)_setExplicitCookieStorage:(CFHTTPCookieStorageRef)storage;
>-@end
>-
>-#endif
>-
> namespace WebKit {
> 
> #if USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>index fa045f9eb0cd7b4a9a14a3faa1e43660e7370b2e..81d7f8e72ffdbd82b76bc5663c6dcef8eb589c17 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>@@ -54,16 +54,6 @@
> 
> using namespace WebKit;
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
>-@interface NSURLSessionConfiguration (WKStaging)
>-@property (copy) NSSet *_suppressedAutoAddedHTTPHeaders;
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>-// FIXME: Remove this once rdar://problem/40650244 is in a build.
>-@property (copy) NSDictionary *_socketStreamProperties;
>-#endif
>-@end
>-#endif
>-
> static NSURLSessionResponseDisposition toNSURLSessionResponseDisposition(WebCore::PolicyAction disposition)
> {
>     switch (disposition) {
>diff --git a/Source/WebKitLegacy/mac/Misc/WebDownload.mm b/Source/WebKitLegacy/mac/Misc/WebDownload.mm
>index 98c7ccabe2196ffffab90c1e1641e488ba1768d9..8c6afd2ca36e8c497fa3f02ae9503890dfc5a824 100644
>--- a/Source/WebKitLegacy/mac/Misc/WebDownload.mm
>+++ b/Source/WebKitLegacy/mac/Misc/WebDownload.mm
>@@ -41,30 +41,10 @@
> 
> using namespace WebCore;
> 
>-@class NSURLConnectionDelegateProxy;
>-
>-// FIXME: The following are NSURLDownload SPI - it would be nice to not have to override them at 
>-// some point in the future
>-@interface NSURLDownload (WebDownloadCapability)
>-- (id)_initWithLoadingConnection:(NSURLConnection *)connection
>-                         request:(NSURLRequest *)request
>-                        response:(NSURLResponse *)response
>-                        delegate:(id)delegate
>-                           proxy:(NSURLConnectionDelegateProxy *)proxy;
>-- (id)_initWithRequest:(NSURLRequest *)request
>-              delegate:(id)delegate
>-             directory:(NSString *)directory;
>-
>-@end
>-
>-@interface WebDownloadInternal : NSObject <NSURLDownloadDelegate>
>-{
>-@public
>+@interface WebDownloadInternal : NSObject <NSURLDownloadDelegate> {
>     id realDelegate;
> }
>-
>-- (void)setRealDelegate:(id)rd;
>-
>+- (void)setRealDelegate:(id)realDelegate;
> @end
> 
> @implementation WebDownloadInternal
>diff --git a/Source/WebKitLegacy/mac/Misc/WebDownloadInternal.h b/Source/WebKitLegacy/mac/Misc/WebDownloadInternal.h
>deleted file mode 100644
>index a33ce908c5c98cbd9b484dd02c995807f63b42cd..0000000000000000000000000000000000000000
>--- a/Source/WebKitLegacy/mac/Misc/WebDownloadInternal.h
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-/*
>- * Copyright (C) 2005 Apple Inc.  All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- *
>- * 1.  Redistributions of source code must retain the above copyright
>- *     notice, this list of conditions and the following disclaimer. 
>- * 2.  Redistributions in binary form must reproduce the above copyright
>- *     notice, this list of conditions and the following disclaimer in the
>- *     documentation and/or other materials provided with the distribution. 
>- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
>- *     its contributors may be used to endorse or promote products derived
>- *     from this software without specific prior written permission. 
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>-* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-*/
>- 
>-#import <WebKitLegacy/WebDownload.h>
>- 
>-@interface WebDownload (WebDownloadCreation)
>-+(id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)r delegate:(id)delegate proxy:(id)proxy;
>-
>-+(id)_downloadWithRequest:(NSURLRequest *)request delegate:(id)delegate directory:(NSString *)directory;
>-
>-@end
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
>index 86be6e4e3672b7d1be8e87e5645cd7bc06c5fe8f..c0776c3e8379eb69d433bc71c9cfa230c79bdc64 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
>@@ -39,7 +39,7 @@
> #import "WebDelegateImplementationCaching.h"
> #import "WebDocumentInternal.h"
> #import "WebDocumentLoaderMac.h"
>-#import "WebDownloadInternal.h"
>+#import "WebDownload.h"
> #import "WebDynamicScrollBarsViewInternal.h"
> #import "WebElementDictionary.h"
> #import "WebFormDelegate.h"
>@@ -318,7 +318,10 @@ void WebFrameLoaderClient::convertMainResourceLoadToDownload(DocumentLoader* doc
> 
>     ResourceHandle* handle = mainResourceLoader->handle();
> 
>+#pragma clang diagnostic push
>+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
>     [WebDownload _downloadWithLoadingConnection:handle->connection() request:request.nsURLRequest(HTTPBodyUpdatePolicy::UpdateHTTPBody) response:response.nsURLResponse() delegate:[webView downloadDelegate] proxy:nil];
>+#pragma clang diagnostic pop
> }
> 
> bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(DocumentLoader* loader, const ResourceRequest& request, const ResourceResponse& response, int length)
>diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
>index b892734caff365dd78549d87ec0a0394976b6666..f6dc95267aa6013eb52e5111c45ef1a7239f5ebf 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
>@@ -58,7 +58,6 @@
> #import "WebDocument.h"
> #import "WebDocumentInternal.h"
> #import "WebDownload.h"
>-#import "WebDownloadInternal.h"
> #import "WebDragClient.h"
> #import "WebDynamicScrollBarsViewInternal.h"
> #import "WebEditingDelegate.h"
>@@ -2450,11 +2449,12 @@ - (WebDownload *)_downloadURL:(NSURL *)URL
>     ASSERT(URL);
>     
>     NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
>-    WebDownload *download = [WebDownload _downloadWithRequest:request
>-                                                     delegate:_private->downloadDelegate
>-                                                    directory:nil];
>+#pragma clang diagnostic push
>+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
>+    WebDownload *download = [WebDownload _downloadWithRequest:request delegate:_private->downloadDelegate directory:nil];
>+#pragma clang diagnostic pop
>     [request release];
>-    
>+
>     return download;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189072: 348380 | 348383 | 348387 | 348471 | 348716