Changeset 194378 in webkit


Ignore:
Timestamp:
Dec 22, 2015, 3:52:00 PM (9 years ago)
Author:
aestes@apple.com
Message:

[CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
​https://bugs.webkit.org/show_bug.cgi?id=152463

Reviewed by Alexey Proskuryakov.

Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
declared in CFNetworkSPI.h.

Source/WebCore:

Also removed some unused declarations and renamed ResourceResponseMac.mm to ResourceResponseCocoa.mm.

  • PlatformMac.cmake:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/ios/WebCoreSystemInterfaceIOS.mm:
  • platform/mac/WebCoreSystemInterface.h:
  • platform/mac/WebCoreSystemInterface.mm:
  • platform/network/NetworkStorageSession.h:
  • platform/network/cf/CredentialStorageCFNet.cpp:

(WebCore::copyCredentialFromProtectionSpace):
(WebCore::CredentialStorage::getFromPersistentStorage):

  • platform/network/cf/NetworkStorageSessionCFNet.cpp:

(WebCore::NetworkStorageSession::cookieStorage):

  • platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::ResourceHandle::createCFURLConnection):

  • platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:

(WebCore::ResourceHandleCFURLConnectionDelegate::createResourceRequest):

  • platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:

(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):

  • platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::setStorageSession):
(WebCore::initializeMaximumHTTPConnectionCountPerHost):
(WebCore::initializeHTTPConnectionSettingsOnStartup):

  • platform/network/cf/ResourceRequestCFNet.h:

(WebCore::toResourceLoadPriority):
(WebCore::toPlatformRequestPriority):

  • platform/network/cf/ResourceResponse.h:
  • platform/network/cf/ResourceResponseCFNet.cpp:

(WebCore::ResourceResponse::platformCertificateInfo):

  • platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:

(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):

  • platform/network/cocoa/ResourceRequestCocoa.mm:

(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdatePlatformRequest):

  • platform/network/cocoa/ResourceResponseCocoa.mm: Renamed from Source/WebCore/platform/network/mac/ResourceResponseMac.mm.

(WebCore::ResourceResponse::platformCertificateInfo):
(WebCore::copyNSURLResponseStatusLine):
(WebCore::ResourceResponse::platformLazyInit):

  • platform/network/ios/QuickLook.h:
  • platform/network/ios/QuickLook.mm:
  • platform/network/ios/WebCoreURLResponseIOS.mm:

(WebCore::adjustMIMETypeIfNecessary):

  • platform/network/mac/ResourceHandleMac.mm:

(WebCore::ResourceHandle::createNSURLConnection):

  • platform/network/mac/WebCoreURLResponse.h:
  • platform/network/mac/WebCoreURLResponse.mm:

(WebCore::adjustMIMETypeIfNecessary):

  • platform/spi/cf/CFNetworkConnectionCacheSPI.h:
  • platform/spi/cf/CFNetworkSPI.h:

Source/WebKit/mac:

  • Plugins/Hosted/HostedNetscapePluginStream.mm:

(WebKit::HostedNetscapePluginStream::didReceiveResponse):

  • Plugins/WebNetscapePluginStream.mm:

(WebNetscapePluginStream::didReceiveResponse):

  • WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface): Deleted.

  • WebView/WebPreferences.mm:

(+[WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:]):

Source/WebKit2:

  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::initializeNetworkSettings):

  • NetworkProcess/mac/NetworkProcessMac.mm:

(WebKit::overrideSystemProxies):

  • WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:

(WebKit::WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts):

  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Location:
trunk/Source
Files:
37 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r194377 r194378  
     12015-12-22  Andy Estes  <aestes@apple.com>
     2
     3        [CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=152463
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
     9        declared in CFNetworkSPI.h.
     10
     11        Also removed some unused declarations and renamed ResourceResponseMac.mm to ResourceResponseCocoa.mm.
     12
     13        * PlatformMac.cmake:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * platform/ios/WebCoreSystemInterfaceIOS.mm:
     16        * platform/mac/WebCoreSystemInterface.h:
     17        * platform/mac/WebCoreSystemInterface.mm:
     18        * platform/network/NetworkStorageSession.h:
     19        * platform/network/cf/CredentialStorageCFNet.cpp:
     20        (WebCore::copyCredentialFromProtectionSpace):
     21        (WebCore::CredentialStorage::getFromPersistentStorage):
     22        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
     23        (WebCore::NetworkStorageSession::cookieStorage):
     24        * platform/network/cf/ResourceHandleCFNet.cpp:
     25        (WebCore::ResourceHandle::createCFURLConnection):
     26        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
     27        (WebCore::ResourceHandleCFURLConnectionDelegate::createResourceRequest):
     28        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
     29        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
     30        * platform/network/cf/ResourceRequestCFNet.cpp:
     31        (WebCore::ResourceRequest::doUpdatePlatformRequest):
     32        (WebCore::ResourceRequest::doUpdateResourceRequest):
     33        (WebCore::ResourceRequest::setStorageSession):
     34        (WebCore::initializeMaximumHTTPConnectionCountPerHost):
     35        (WebCore::initializeHTTPConnectionSettingsOnStartup):
     36        * platform/network/cf/ResourceRequestCFNet.h:
     37        (WebCore::toResourceLoadPriority):
     38        (WebCore::toPlatformRequestPriority):
     39        * platform/network/cf/ResourceResponse.h:
     40        * platform/network/cf/ResourceResponseCFNet.cpp:
     41        (WebCore::ResourceResponse::platformCertificateInfo):
     42        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
     43        (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
     44        * platform/network/cocoa/ResourceRequestCocoa.mm:
     45        (WebCore::ResourceRequest::doUpdateResourceRequest):
     46        (WebCore::ResourceRequest::doUpdatePlatformRequest):
     47        * platform/network/cocoa/ResourceResponseCocoa.mm: Renamed from Source/WebCore/platform/network/mac/ResourceResponseMac.mm.
     48        (WebCore::ResourceResponse::platformCertificateInfo):
     49        (WebCore::copyNSURLResponseStatusLine):
     50        (WebCore::ResourceResponse::platformLazyInit):
     51        * platform/network/ios/QuickLook.h:
     52        * platform/network/ios/QuickLook.mm:
     53        * platform/network/ios/WebCoreURLResponseIOS.mm:
     54        (WebCore::adjustMIMETypeIfNecessary):
     55        * platform/network/mac/ResourceHandleMac.mm:
     56        (WebCore::ResourceHandle::createNSURLConnection):
     57        * platform/network/mac/WebCoreURLResponse.h:
     58        * platform/network/mac/WebCoreURLResponse.mm:
     59        (WebCore::adjustMIMETypeIfNecessary):
     60        * platform/spi/cf/CFNetworkConnectionCacheSPI.h:
     61        * platform/spi/cf/CFNetworkSPI.h:
     62
    1632015-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
    264

  • trunk/Source/WebCore/PlatformMac.cmake

    r192412 r194378  
    521521    platform/network/cocoa/ProtectionSpaceCocoa.mm
    522522    platform/network/cocoa/ResourceRequestCocoa.mm
     523    platform/network/cocoa/ResourceResponseCocoa.mm
    523524
    524525    platform/network/mac/AuthenticationMac.mm
    … …  
    533534    platform/network/mac/ResourceHandleMac.mm
    534535    platform/network/mac/ResourceRequestMac.mm
    535     platform/network/mac/ResourceResponseMac.mm
    536536    platform/network/mac/SynchronousLoaderClient.mm
    537537    platform/network/mac/UTIUtilities.mm

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r194319 r194378  
    19771977                514C76510CE9234E007EF3CD /* ResourceHandleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */; };
    19781978                514C76530CE9234E007EF3CD /* ResourceRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */; };
    1979                 514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */; };
    19801979                514C766D0CE923A1007EF3CD /* CredentialBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76580CE923A1007EF3CD /* CredentialBase.cpp */; };
    19811980                514C766E0CE923A1007EF3CD /* Credential.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C76590CE923A1007EF3CD /* Credential.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    40134012                A10BB5851484E3A700B2E87A /* RenderSVGRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5831484E3A700B2E87A /* RenderSVGRect.h */; };
    40144013                A10BB58B1484E3B300B2E87A /* RenderSVGShape.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5891484E3B300B2E87A /* RenderSVGShape.h */; };
     4014                A10D7FEC1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    40154015                A10DBF4718F92317000D70C6 /* QuickLookHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    40164016                A10DC76A14747BAB005E2471 /* StyleGridData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A10DC76814747BAB005E2471 /* StyleGridData.cpp */; };
    … …  
    40964096                A1ED778D1BE3294000DC1791 /* Device.h in Headers */ = {isa = PBXBuildFile; fileRef = A1ED778B1BE3294000DC1791 /* Device.h */; settings = {ATTRIBUTES = (Private, ); }; };
    40974097                A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A1ED778E1BE4291800DC1791 /* UIKitSPI.h */; };
     4098                A1F78D0C1C25424C00245446 /* ResourceResponseCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */; };
    40984099                A2B9217316C5CC420041DCD9 /* IntRectExtent.h in Headers */ = {isa = PBXBuildFile; fileRef = A2B9217216C5CC420041DCD9 /* IntRectExtent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    40994100                A31C4E4D16E02AA6002F7957 /* OESTextureHalfFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A31C4E4C16E02AA6002F7957 /* OESTextureHalfFloat.cpp */; };
    … …  
    61246125                CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
    61256126                CE7B2DB61586ABAD0098B3FA /* TextAlternativeWithRange.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */; };
    6126                 CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    61276127                CE95208A1811B475007A5392 /* WebSafeIncrementalSweeperIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C2C4CB1D161A131200D214DA /* WebSafeIncrementalSweeperIOS.h */; };
    61286128                CEC337AD1A46071F009B8523 /* ServersSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC337AC1A46071F009B8523 /* ServersSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    94009400                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleMac.mm; sourceTree = "<group>"; };
    94019401                514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestMac.mm; sourceTree = "<group>"; };
    9402                 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceResponseMac.mm; sourceTree = "<group>"; };
    94039402                514C76580CE923A1007EF3CD /* CredentialBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialBase.cpp; sourceTree = "<group>"; };
    94049403                514C76590CE923A1007EF3CD /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = "<group>"; };
    … …  
    1157611575                A10BB5881484E3B300B2E87A /* RenderSVGShape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGShape.cpp; sourceTree = "<group>"; };
    1157711576                A10BB5891484E3B300B2E87A /* RenderSVGShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGShape.h; sourceTree = "<group>"; };
     11577                A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
    1157811578                A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookHandleClient.h; sourceTree = "<group>"; };
    1157911579                A10DC76814747BAB005E2471 /* StyleGridData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleGridData.cpp; sourceTree = "<group>"; };
    … …  
    1165511655                A1ED778B1BE3294000DC1791 /* Device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Device.h; sourceTree = "<group>"; };
    1165611656                A1ED778E1BE4291800DC1791 /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
     11657                A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceResponseCocoa.mm; sourceTree = "<group>"; };
    1165711658                A208E222A56A0C7575F2A72E /* RenderMathMLMenclose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLMenclose.h; sourceTree = "<group>"; };
    1165811659                A2B9217216C5CC420041DCD9 /* IntRectExtent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntRectExtent.h; sourceTree = "<group>"; };
    … …  
    1399813999                CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextAlternativeWithRange.h; sourceTree = "<group>"; };
    1399914000                CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextAlternativeWithRange.mm; sourceTree = "<group>"; };
    14000                 CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
    1400114001                CEC337AC1A46071F009B8523 /* ServersSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServersSPI.h; sourceTree = "<group>"; };
    1400214002                CEC337AE1A46086D009B8523 /* GraphicsServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsServicesSPI.h; sourceTree = "<group>"; };
    … …  
    1722617226                                E10A39E11AE84E7100A29AE3 /* CFBundleSPI.h */,
    1722717227                                65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
    17228                                 CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */,
     17228                                A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */,
    1722917229                                CE12525A1A1C018200864480 /* CFNetworkSPI.h */,
    1723017230                                4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */,
    … …  
    1749117491                                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */,
    1749217492                                514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */,
    17493                                 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */,
    1749417493                                E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */,
    1749517494                                1FAFBF1615A5FA5200083A20 /* UTIUtilities.h */,
    … …  
    1786617865                                372ADA39197F687600FC501E /* ProtectionSpaceCocoa.mm */,
    1786717866                                7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */,
     17867                                A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */,
    1786817868                        );
    1786917869                        path = cocoa;
    … …  
    2466924669                                85031B3D0A44EFC700F992E0 /* BeforeUnloadEvent.h in Headers */,
    2467024670                                B2C3DA240D006C1D00EF6F26 /* BidiContext.h in Headers */,
     24671                                A10D7FEC1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h in Headers */,
    2467124672                                B2C3DA250D006C1D00EF6F26 /* BidiResolver.h in Headers */,
    2467224673                                BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */,
    … …  
    2475024751                                5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
    2475124752                                E10A39E21AE84E7100A29AE3 /* CFBundleSPI.h in Headers */,
    24752                                 CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */,
    2475324753                                CE12525B1A1C018200864480 /* CFNetworkSPI.h in Headers */,
    2475424754                                E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
    … …  
    2906529065                                850657030AAB4763002D15C0 /* DOMStyleSheetList.mm in Sources */,
    2906629066                                85ACA99D0A9B575900671E90 /* DOMText.mm in Sources */,
     29067                                A1F78D0C1C25424C00245446 /* ResourceResponseCocoa.mm in Sources */,
    2906729068                                933A14AA0B7D1D0900A53FFD /* DOMTextEvent.mm in Sources */,
    2906829069                                188604B30F2E654A000B6443 /* DOMTimer.cpp in Sources */,
    … …  
    3078630787                                514C767E0CE923A1007EF3CD /* ResourceResponseBase.cpp in Sources */,
    3078730788                                7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */,
    30788                                 514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */,
    3078930789                                ADBAD6EE1BCDD95500381325 /* ResourceUsageOverlay.cpp in Sources */,
    3079030790                                ADFE2B551BD5F61200DAB457 /* ResourceUsageOverlayCocoa.mm in Sources */,

  • trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm

    r191904 r194378  
    2828
    2929WEBCORE_EXPORT void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
    30 WEBCORE_EXPORT BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
    3130WEBCORE_EXPORT CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
    3231WEBCORE_EXPORT void (*wkClearGlyphVector)(void* glyphs);
    3332WEBCORE_EXPORT OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
    34 WEBCORE_EXPORT NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
    3533WEBCORE_EXPORT bool (*wkCGContextIsPDFContext)(CGContextRef);
    36 WEBCORE_EXPORT NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
    37 WEBCORE_EXPORT void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
    3834WEBCORE_EXPORT id (*wkCreateNSURLConnectionDelegateProxy)(void);
    39 WEBCORE_EXPORT unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
    40 WEBCORE_EXPORT int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
    41 WEBCORE_EXPORT void (*wkSetHTTPRequestMaximumPriority)(int priority);
    42 WEBCORE_EXPORT void (*wkSetHTTPRequestPriority)(CFURLRequestRef, int priority);
    43 WEBCORE_EXPORT void (*wkSetHTTPRequestMinimumFastLanePriority)(int priority);
    44 WEBCORE_EXPORT void (*wkHTTPRequestEnablePipelining)(CFURLRequestRef);
    4535WEBCORE_EXPORT void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
    4636WEBCORE_EXPORT void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
    … …  
    4838WEBCORE_EXPORT CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
    4939WEBCORE_EXPORT void (*wkSetLayerContentsScale)(CALayer *);
    50 WEBCORE_EXPORT void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
    51 WEBCORE_EXPORT CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
    5240WEBCORE_EXPORT CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
    53 
    54 #if USE(CFNETWORK)
    55 WEBCORE_EXPORT CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
    56 WEBCORE_EXPORT WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
    57 WEBCORE_EXPORT void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
    58 WEBCORE_EXPORT void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
    59 #endif
    6041
    6142WEBCORE_EXPORT CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
    6243WEBCORE_EXPORT NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
    63 WEBCORE_EXPORT CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
    6444WEBCORE_EXPORT unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
    65 WEBCORE_EXPORT void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
    6645WEBCORE_EXPORT NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
    6746WEBCORE_EXPORT NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
    … …  
    6948WEBCORE_EXPORT void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
    7049WEBCORE_EXPORT void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
    71 
    72 WEBCORE_EXPORT CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef);
    73 WEBCORE_EXPORT CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
    74 WEBCORE_EXPORT CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
    75 WEBCORE_EXPORT CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
    76 WEBCORE_EXPORT void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
    7750
    7851WEBCORE_EXPORT void(*wkDestroyRenderingResources)(void);

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r191904 r194378  
    122122extern void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef, void (^block)(CGRect rect));
    123123
    124 extern BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
    125124typedef enum {
    126125    wkPatternTilingNoDistortion,
    … …  
    132131#endif
    133132extern CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
    134 extern NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
    135 extern CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
    136133extern CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
    137134#if !PLATFORM(IOS)
    138 extern void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
    139135extern void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
    140136extern void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int);
    141137extern bool (*wkDrawFocusRingAtTime)(CGContextRef, NSTimeInterval time);
    142138extern bool (*wkDrawCellFocusRingWithFrameAtTime)(NSCell *cell, NSRect cellFrame, NSView *controlView, NSTimeInterval time);
    143 #endif
    144 #if !PLATFORM(IOS)
    145139extern void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
    146140    float duration, unsigned state);
    147141extern void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
    148142extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
    149 #endif
    150 #if !PLATFORM(IOS)
    151143extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
    152 #endif
    153 extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
    154 #if !PLATFORM(IOS)
    155144extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
    156145extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
    … …  
    179168extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
    180169extern NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
    181 extern float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
    182170extern int (*wkQTMovieGetType)(QTMovie*);
    183171extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
    … …  
    185173extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
    186174extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
    187 extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
    188175extern NSArray *(*wkQTGetSitesInMediaDownloadCache)();
    189176extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
    190177extern void (*wkQTClearMediaDownloadCache)();
    191 extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
    192178extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
    193179extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
    194180#endif
    195 extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
    196181extern bool (*wkCGContextIsPDFContext)(CGContextRef);
    197 extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
    198 extern int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
    199 extern void (*wkSetHTTPRequestMaximumPriority)(int maximumPriority);
    200 extern void (*wkSetHTTPRequestPriority)(CFURLRequestRef, int priority);
    201 extern void (*wkSetHTTPRequestMinimumFastLanePriority)(int priority);
    202 extern void (*wkHTTPRequestEnablePipelining)(CFURLRequestRef);
    203182extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
    204183extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
    … …  
    242221
    243222typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
    244 extern CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
    245223extern unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
    246 extern void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
    247224extern NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
    248225extern NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
    … …  
    251228extern void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
    252229
    253 extern CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef);
    254 extern CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
    255 extern CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
    256 extern CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
    257 extern void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
    258 
    259 #if USE(CFNETWORK)
    260 extern CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
    261 extern WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
    262 extern void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
    263 extern void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
    264 #endif
    265230#if !PLATFORM(IOS)
    266231extern void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
    267 #endif
    268 
    269 extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
    270 
    271 #if !PLATFORM(IOS)
    272232extern CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
    273233extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

    r191466 r194378  
    3333void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *);
    3434void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
    35 BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
    3635bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
    3736CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
    38 NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
    39 CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
    4037CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
    41 void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
    4238void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
    4339void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int);
    … …  
    5551CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
    5652NSTimeInterval (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
    57 NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
    5853BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
    5954void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
    … …  
    6459float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
    6560NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
    66 float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
    6761int (*wkQTMovieGetType)(QTMovie*);
    6862BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
    … …  
    7064void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
    7165void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
    72 void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
    7366NSArray *(*wkQTGetSitesInMediaDownloadCache)();
    7467void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
    7568void (*wkQTClearMediaDownloadCache)();
    7669
    77 void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
    7870void (*wkSetDragImage)(NSImage*, NSPoint offset);
    7971bool (*wkCGContextIsPDFContext)(CGContextRef);
    80 void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
    81 unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
    82 int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
    83 void (*wkSetHTTPRequestMaximumPriority)(int priority);
    84 void (*wkSetHTTPRequestPriority)(CFURLRequestRef, int priority);
    85 void (*wkSetHTTPRequestMinimumFastLanePriority)(int priority);
    86 void (*wkHTTPRequestEnablePipelining)(CFURLRequestRef);
    8772void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
    8873void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
    8974CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
    90 
    91 #if USE(CFNETWORK)
    92 CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
    93 WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
    94 void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
    95 void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
    96 #endif
    9775
    9876void* wkGetHyphenationLocationBeforeIndex;
    … …  
    12098CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
    12199NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
    122 CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
    123100unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
    124 void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
    125101NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
    126102NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
    … …  
    129105void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
    130106
    131 CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef);
    132 CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
    133 CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
    134 CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
    135 void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
    136107void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
    137 
    138 void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
    139108
    140109#if !PLATFORM(IOS)

  • trunk/Source/WebCore/platform/network/NetworkStorageSession.h

    r186476 r194378  
    3333
    3434#if PLATFORM(COCOA) || USE(CFNETWORK)
    35 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
    36 typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
     35#include "CFNetworkSPI.h"
    3736#endif
    3837

  • trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp

    r171801 r194378  
    3030
    3131#include "AuthenticationCF.h"
     32#include "CFNetworkSPI.h"
    3233#include "Credential.h"
    3334#include "ProtectionSpace.h"
    … …  
    4546
    4647namespace WebCore {
     48   
     49static inline CFURLCredentialRef copyCredentialFromProtectionSpace(CFURLProtectionSpaceRef protectionSpace)
     50{
     51    auto storage = adoptCF(CFURLCredentialStorageCreate(kCFAllocatorDefault));
     52    return CFURLCredentialStorageCopyDefaultCredentialForProtectionSpace(storage.get(), protectionSpace);
     53}
    4754
    4855Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
    4956{
    5057#if PLATFORM(COCOA)
    51     RetainPtr<CFURLCredentialRef> credentialCF = adoptCF(wkCopyCredentialFromCFPersistentStorage(protectionSpace.cfSpace()));
     58    auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpace.cfSpace()));
    5259    return Credential(credentialCF.get());
    5360#else
    54     RetainPtr<CFURLProtectionSpaceRef> protectionSpaceCF = adoptCF(createCF(protectionSpace));
    55     RetainPtr<CFURLCredentialRef> credentialCF = adoptCF(wkCopyCredentialFromCFPersistentStorage(protectionSpaceCF.get()));
     61    auto protectionSpaceCF = adoptCF(createCF(protectionSpace));
     62    auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpaceCF.get()));
    5663    return core(credentialCF.get());
    5764#endif

  • trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp

    r186369 r194378  
    8585{
    8686    if (m_platformSession)
    87         return adoptCF(wkCopyHTTPCookieStorage(m_platformSession.get()));
     87        return adoptCF(_CFURLStorageSessionCopyCookieStorage(kCFAllocatorDefault, m_platformSession.get()));
    8888
    8989#if USE(CFNETWORK)
    90     return wkGetDefaultHTTPCookieStorage();
     90    return _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault);
    9191#else
    9292    // When using NSURLConnection, we also use its shared cookie storage.

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r194161 r194378  
    117117    LOG(Network, "CFNet - Destroying job %p (%s)", this, d->m_firstRequest.url().string().utf8().data());
    118118}
     119   
     120static inline CFStringRef shouldSniffConnectionProperty()
     121{
     122#if PLATFORM(WIN)
     123    return CFSTR("_kCFURLConnectionPropertyShouldSniff");
     124#else
     125    return _kCFURLConnectionPropertyShouldSniff;
     126#endif
     127}
    119128
    120129void ResourceHandle::createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff, SchedulingBehavior schedulingBehavior, CFDictionaryRef clientProperties)
    … …  
    148157    }
    149158
    150     RetainPtr<CFMutableURLRequestRef> request = adoptCF(CFURLRequestCreateMutableCopy(kCFAllocatorDefault, firstRequest().cfURLRequest(UpdateHTTPBody)));
    151     wkSetRequestStorageSession(d->m_storageSession.get(), request.get());
     159    auto request = adoptCF(CFURLRequestCreateMutableCopy(kCFAllocatorDefault, firstRequest().cfURLRequest(UpdateHTTPBody)));
     160    if (auto storageSession = d->m_storageSession.get())
     161        _CFURLRequestSetStorageSession(request.get(), storageSession);
    152162   
    153163    if (!shouldContentSniff)
    154         wkSetCFURLRequestShouldContentSniff(request.get(), false);
     164        _CFURLRequestSetProtocolProperty(request.get(), shouldSniffConnectionProperty(), kCFBooleanFalse);
    155165
    156166    RetainPtr<CFMutableDictionaryRef> sslProps;

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp

    r174787 r194378  
    159159        RetainPtr<CFStringRef> newMethod = adoptCF(CFURLRequestCopyHTTPRequestMethod(cfRequest));
    160160        if (CFStringCompareWithOptions(lastHTTPMethod.get(), newMethod.get(), CFRangeMake(0, CFStringGetLength(lastHTTPMethod.get())), kCFCompareCaseInsensitive)) {
    161             RetainPtr<CFMutableURLRequestRef> mutableRequest = adoptCF(CFURLRequestCreateMutableCopy(0, cfRequest));
    162             wkSetRequestStorageSession(m_handle->storageSession(), mutableRequest.get());
     161            auto mutableRequest = adoptCF(CFURLRequestCreateMutableCopy(kCFAllocatorDefault, cfRequest));
     162            if (auto storageSession = m_handle->storageSession())
     163                _CFURLRequestSetStorageSession(mutableRequest.get(), storageSession);
    163164            CFURLRequestSetHTTPRequestMethod(mutableRequest.get(), lastHTTPMethod.get());
    164165

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp

    r174787 r194378  
    3131#include "AuthenticationCF.h"
    3232#include "AuthenticationChallenge.h"
     33#include "CFNetworkSPI.h"
    3334#include "Logging.h"
    3435#include "ResourceHandle.h"
    … …  
    3637#include "ResourceResponse.h"
    3738#include "SharedBuffer.h"
    38 #include "WebCoreSystemInterface.h"
    3939#include "WebCoreURLResponse.h"
    4040#include <wtf/MainThread.h>
    … …  
    141141
    142142        // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
    143         CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);
     143        auto msg = CFURLResponseGetHTTPResponse(cfResponse);
    144144        int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
    145145
    … …  
    149149#if !PLATFORM(IOS)
    150150        if (_CFURLRequestCopyProtocolPropertyForKey(m_handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
    151             wkSetCFURLResponseMIMEType(cfResponse, CFSTR("text/html"));
     151            CFURLResponseSetMIMEType(cfResponse, CFSTR("text/html"));
    152152#endif // !PLATFORM(IOS)
    153153       

  • trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r186279 r194378  
    2727#include "ResourceRequestCFNet.h"
    2828
     29#include "CFNetworkSPI.h"
    2930#include "HTTPHeaderNames.h"
    3031#include "ResourceRequest.h"
    … …  
    3839#include <CFNetwork/CFURLRequestPriv.h>
    3940#include <wtf/text/CString.h>
    40 #endif
    41 
    42 #if PLATFORM(IOS)
    43 #include "CFNetworkConnectionCacheSPI.h"
    4441#endif
    4542
    … …  
    155152
    156153    if (httpPipeliningEnabled())
    157         wkHTTPRequestEnablePipelining(cfRequest);
     154        CFURLRequestSetShouldPipelineHTTP(cfRequest, true, true);
    158155
    159156    if (resourcePrioritiesEnabled())
    160         wkSetHTTPRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
     157        CFURLRequestSetRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
    161158
    162159#if !PLATFORM(WIN)
    163     wkCFURLRequestAllowAllPostCaching(cfRequest);
     160    _CFURLRequestSetProtocolProperty(cfRequest, kCFURLRequestAllowAllPOSTCaching, kCFBooleanTrue);
    164161#endif
    165162
    … …  
    262259
    263260    if (resourcePrioritiesEnabled())
    264         m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority(m_cfRequest.get()));
     261        m_priority = toResourceLoadPriority(CFURLRequestGetRequestPriority(m_cfRequest.get()));
    265262
    266263    m_httpHeaderFields.clear();
    … …  
    317314    updatePlatformRequest();
    318315
    319     CFMutableURLRequestRef cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
    320     wkSetRequestStorageSession(storageSession, cfRequest);
     316    auto cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
     317    if (storageSession)
     318        _CFURLRequestSetStorageSession(cfRequest, storageSession);
    321319    m_cfRequest = adoptCF(cfRequest);
    322320#if PLATFORM(COCOA)
    … …  
    392390    static const unsigned unlimitedRequestCount = 10000;
    393391
    394     unsigned maximumHTTPConnectionCountPerHost = wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
     392    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
     393    unsigned maximumHTTPConnectionCountPerHost = _CFNetworkHTTPConnectionCacheGetLimit(kHTTPLoadWidth);
    395394
    396395    Boolean keyExistsAndHasValidFormat = false;
    … …  
    403402        return maximumHTTPConnectionCountPerHost;
    404403
    405     wkSetHTTPRequestMaximumPriority(toPlatformRequestPriority(ResourceLoadPriority::Highest));
     404    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPPriorityNumLevels, toPlatformRequestPriority(ResourceLoadPriority::Highest));
    406405#if !PLATFORM(WIN)
    407406    // FIXME: <rdar://problem/9375609> Implement minimum fast lane priority setting on Windows
    408     wkSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(ResourceLoadPriority::Medium));
     407    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPMinimumFastLanePriority, toPlatformRequestPriority(ResourceLoadPriority::Medium));
    409408#endif
    410409
    … …  
    421420    static const unsigned preferredConnectionCount = 6;
    422421    static const unsigned fastLaneConnectionCount = 1;
    423     wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
    424     wkSetHTTPRequestMaximumPriority(toPlatformRequestPriority(ResourceLoadPriority::Highest));
    425     wkSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(ResourceLoadPriority::Medium));
     422    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
     423    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPPriorityNumLevels, toPlatformRequestPriority(ResourceLoadPriority::Highest));
     424    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPMinimumFastLanePriority, toPlatformRequestPriority(ResourceLoadPriority::Medium));
    426425    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPNumFastLanes, fastLaneConnectionCount);
    427426}

  • trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h

    r183563 r194378  
    2727#define ResourceRequestCFNet_h
    2828
     29#include "CFNetworkSPI.h"
    2930#include "ResourceLoadPriority.h"
    30 
    31 #if USE(CFNETWORK)
    32 typedef const struct _CFURLRequest* CFURLRequestRef;
    33 #endif
    3431
    3532namespace WebCore {
    … …  
    4239#endif
    4340
    44 inline ResourceLoadPriority toResourceLoadPriority(int priority)
     41inline ResourceLoadPriority toResourceLoadPriority(CFURLRequestPriority priority)
    4542{
    4643    switch (priority) {
    … …  
    6259}
    6360
    64 inline int toPlatformRequestPriority(ResourceLoadPriority priority)
     61inline CFURLRequestPriority toPlatformRequestPriority(ResourceLoadPriority priority)
    6562{
    6663    switch (priority) {

  • trunk/Source/WebCore/platform/network/cf/ResourceResponse.h

    r182707 r194378  
    3131
    3232#if USE(CFNETWORK)
    33 typedef struct _CFURLResponse* CFURLResponseRef;
     33#include "CFNetworkSPI.h"
    3434#endif
    3535

  • trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp

    r189203 r194378  
    114114}
    115115
     116#if !PLATFORM(COCOA)
    116117CertificateInfo ResourceResponse::platformCertificateInfo() const
    117118{
    118 #if PLATFORM(COCOA)
    119     return CertificateInfo(adoptCF(wkCopyNSURLResponseCertificateChain(nsURLResponse())));
     119    return { };
     120}
    120121#endif
    121     return CertificateInfo();
    122 }
    123122
    124123String ResourceResponse::platformSuggestedFilename() const

  • trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp

    r189200 r194378  
    4242
    4343#if PLATFORM(COCOA)
     44#include "CFNetworkSPI.h"
    4445#include "WebCoreSystemInterface.h"
    4546#include "WebCoreURLResponse.h"
    … …  
    144145#if PLATFORM(COCOA)
    145146    // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
    146     CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);
     147    auto msg = CFURLResponseGetHTTPResponse(cfResponse);
    147148    int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
    148149
    … …  
    152153#if !PLATFORM(IOS)
    153154    if (_CFURLRequestCopyProtocolPropertyForKey(m_handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
    154         wkSetCFURLResponseMIMEType(cfResponse, CFSTR("text/html"));
     155        CFURLResponseSetMIMEType(cfResponse, CFSTR("text/html"));
    155156#endif // !PLATFORM(IOS)
    156157#else

  • trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h

    r172814 r194378  
    3232
    3333#if USE(CFNETWORK)
    34 typedef const struct _CFURLCredential* CFURLCredentialRef;
     34#include "CFNetworkSPI.h"
    3535#endif
    3636

  • trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm

    r186137 r194378  
    8080
    8181    if (resourcePrioritiesEnabled())
    82         m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority([m_nsRequest.get() _CFURLRequest]));
     82        m_priority = toResourceLoadPriority(m_nsRequest ? CFURLRequestGetRequestPriority([m_nsRequest _CFURLRequest]) : 0);
    8383
    8484    m_httpHeaderFields.clear();
    … …  
    134134
    135135    if (ResourceRequest::httpPipeliningEnabled())
    136         wkHTTPRequestEnablePipelining([nsRequest _CFURLRequest]);
     136        CFURLRequestSetShouldPipelineHTTP([nsRequest _CFURLRequest], true, true);
    137137
    138138    if (ResourceRequest::resourcePrioritiesEnabled())
    139         wkSetHTTPRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(priority()));
     139        CFURLRequestSetRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(priority()));
    140140
    141141    [nsRequest setCachePolicy:(NSURLRequestCachePolicy)cachePolicy()];
    142     wkCFURLRequestAllowAllPostCaching([nsRequest _CFURLRequest]);
     142    _CFURLRequestSetProtocolProperty([nsRequest _CFURLRequest], kCFURLRequestAllowAllPOSTCaching, kCFBooleanTrue);
    143143
    144144    double timeoutInterval = ResourceRequestBase::timeoutInterval();

  • trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm

    r194377 r194378  
    2727#import "ResourceResponse.h"
    2828
     29#if PLATFORM(COCOA)
     30
     31#import "CFNetworkSPI.h"
    2932#import "HTTPParsers.h"
    3033#import "WebCoreURLResponse.h"
    31 #import "WebCoreSystemInterface.h"
    3234#import <Foundation/Foundation.h>
    3335#import <limits>
    3436#import <wtf/StdLibExtras.h>
    35 
    36 @interface NSURLResponse (WebNSURLResponseDetails)
    37 - (NSTimeInterval)_calculatedExpiration;
    38 - (id)_initWithCFURLResponse:(CFURLResponseRef)response;
    39 - (CFURLResponseRef) _CFURLResponse;
    40 + (id)_responseWithCFURLResponse:(CFURLResponseRef)response;
    41 @end
    42 
    4337
    4438namespace WebCore {
    … …  
    7266}
    7367
     68CertificateInfo ResourceResponse::platformCertificateInfo() const
     69{
     70    ASSERT(m_nsResponse);
     71    auto cfResponse = [m_nsResponse _CFURLResponse];
     72    if (!cfResponse)
     73        return { };
     74
     75    CFDictionaryRef context = _CFURLResponseGetSSLCertificateContext(cfResponse);
     76    if (!context)
     77        return { };
     78
     79    auto trustValue = CFDictionaryGetValue(context, kCFStreamPropertySSLPeerTrust);
     80    if (!trustValue)
     81        return { };
     82    ASSERT(CFGetTypeID(trustValue) == SecTrustGetTypeID());
     83    auto trust = (SecTrustRef)trustValue;
     84
     85    SecTrustResultType trustResultType;
     86    OSStatus result = SecTrustGetTrustResult(trust, &trustResultType);
     87    if (result != errSecSuccess)
     88        return { };
     89
     90    if (trustResultType == kSecTrustResultInvalid) {
     91        result = SecTrustEvaluate(trust, &trustResultType);
     92        if (result != errSecSuccess)
     93            return { };
     94    }
     95
     96    CFIndex count = SecTrustGetCertificateCount(trust);
     97    auto certificateChain = CFArrayCreateMutable(0, count, &kCFTypeArrayCallBacks);
     98    for (CFIndex i = 0; i < count; i++)
     99        CFArrayAppendValue(certificateChain, SecTrustGetCertificateAtIndex(trust, i));
     100
     101    return CertificateInfo(adoptCF(certificateChain));
     102}
     103
    74104#if USE(CFNETWORK)
    75105
    … …  
    111141        initNSURLResponse();
    112142    return m_nsResponse.get();
     143}
     144   
     145static NSString *copyNSURLResponseStatusLine(NSURLResponse *response)
     146{
     147    CFURLResponseRef cfResponse = [response _CFURLResponse];
     148    if (!cfResponse)
     149        return nil;
     150
     151    CFHTTPMessageRef cfHTTPMessage = CFURLResponseGetHTTPResponse(cfResponse);
     152    if (!cfHTTPMessage)
     153        return nil;
     154
     155    return (NSString *)CFHTTPMessageCopyResponseStatusLine(cfHTTPMessage);
    113156}
    114157
    … …  
    158201
    159202            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
    160             if (RetainPtr<NSString> httpStatusLine = adoptNS(wkCopyNSURLResponseStatusLine(httpResponse)))
     203            if (RetainPtr<NSString> httpStatusLine = adoptNS(copyNSURLResponseStatusLine(httpResponse)))
    161204                m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get());
    162205            else
    … …  
    174217}
    175218
    176 CertificateInfo ResourceResponse::platformCertificateInfo() const
    177 {
    178     ASSERT(m_nsResponse);
    179     return CertificateInfo(adoptCF(wkCopyNSURLResponseCertificateChain(m_nsResponse.get())));
    180 }
    181 
    182219String ResourceResponse::platformSuggestedFilename() const
    183220{
    … …  
    194231} // namespace WebCore
    195232
     233#endif // PLATFORM(COCOA)

  • trunk/Source/WebCore/platform/network/ios/QuickLook.h

    r188820 r194378  
    3434#import <wtf/RefPtr.h>
    3535
     36#if USE(CFNETWORK)
     37#include "CFNetworkSPI.h"
     38#endif
     39
    3640OBJC_CLASS NSData;
    3741OBJC_CLASS NSDictionary;
    … …  
    4448OBJC_CLASS NSURLResponse;
    4549OBJC_CLASS QLPreviewConverter;
    46 
    47 #if USE(CFNETWORK)
    48 typedef struct _CFURLResponse* CFURLResponseRef;
    49 typedef struct _CFURLConnection* CFURLConnectionRef;
    50 #endif
    5150
    5251namespace WebCore {

  • trunk/Source/WebCore/platform/network/ios/QuickLook.mm

    r188594 r194378  
    4747#import <wtf/text/WTFString.h>
    4848
    49 #if USE(CFNETWORK)
    50 #import <CFNetwork/CFURLConnection.h>
    51 
    52 @interface NSURLResponse (QuickLookDetails)
    53 +(NSURLResponse *)_responseWithCFURLResponse:(CFURLResponseRef)response;
    54 -(CFURLResponseRef)_CFURLResponse;
    55 @end
    56 #endif
    57 
    5849using namespace WebCore;
    5950

  • trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm

    r183598 r194378  
    4949void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse)
    5050{
    51     RetainPtr<CFStringRef> mimeType = wkGetCFURLResponseMIMEType(cfResponse);
     51    RetainPtr<CFStringRef> mimeType = CFURLResponseGetMIMEType(cfResponse);
    5252    RetainPtr<CFStringRef> updatedMIMEType = mimeType;
    5353    if (!updatedMIMEType)
    … …  
    5858    // We filter the basic MIME types so that we don't do unnecessary work in standard browsing situations.
    5959    if (shouldUseQuickLookForMIMEType((NSString *)updatedMIMEType.get())) {
    60         RetainPtr<CFStringRef> suggestedFilename = adoptCF(wkCopyCFURLResponseSuggestedFilename(cfResponse));
     60        RetainPtr<CFStringRef> suggestedFilename = adoptCF(CFURLResponseCopySuggestedFilename(cfResponse));
    6161        RetainPtr<CFStringRef> quickLookMIMEType = adoptCF((CFStringRef)QLTypeCopyBestMimeTypeForFileNameAndMimeType((NSString *)suggestedFilename.get(), (NSString *)mimeType.get()));
    6262        if (!quickLookMIMEType) {
    63             CFURLRef url = wkGetCFURLResponseURL(cfResponse);
    64             NSURL *nsURL = (NSURL *)url;
    65             if ([nsURL isFileURL]) {
     63            auto url = CFURLResponseGetURL(cfResponse);
     64            if ([(NSURL *)url isFileURL]) {
    6665                RetainPtr<CFStringRef> extension = adoptCF(CFURLCopyPathExtension(url));
    6766                if (extension) {
    … …  
    7776#endif // USE(QUICK_LOOK)
    7877    if (!mimeType || CFStringCompare(mimeType.get(), updatedMIMEType.get(), kCFCompareCaseInsensitive) != kCFCompareEqualTo)
    79         wkSetCFURLResponseMIMEType(cfResponse, updatedMIMEType.get());
     78        CFURLResponseSetMIMEType(cfResponse, updatedMIMEType.get());
    8079}
    8180

  • trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

    r194159 r194378  
    169169    if (!shouldContentSniff) {
    170170        NSMutableURLRequest *mutableRequest = [[nsRequest mutableCopy] autorelease];
    171         wkSetNSURLRequestShouldContentSniff(mutableRequest, NO);
     171        [mutableRequest _setProperty:@(NO) forKey:(NSString *)_kCFURLConnectionPropertyShouldSniff];
    172172        nsRequest = mutableRequest;
    173173    }

  • trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h

    r179861 r194378  
    2727 */
    2828
    29 typedef struct _CFURLResponse* CFURLResponseRef;
     29#include "CFNetworkSPI.h"
    3030
    3131#ifdef __OBJC__
    3232@interface NSURLResponse (Details)
    33 - (CFURLResponseRef)_CFURLResponse;
    3433- (void)_setMIMEType:(NSString *)type;
    3534@end

  • trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm

    r179364 r194378  
    289289void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse)
    290290{
    291     RetainPtr<CFStringRef> result = wkGetCFURLResponseMIMEType(cfResponse);
     291    RetainPtr<CFStringRef> result = CFURLResponseGetMIMEType(cfResponse);
    292292    RetainPtr<CFStringRef> originalResult = result;
    293293
    294294    if (!result) {
    295         CFURLRef url = wkGetCFURLResponseURL(cfResponse);
    296         NSURL *nsURL = (NSURL *)url;
    297         if ([nsURL isFileURL]) {
     295        auto url = CFURLResponseGetURL(cfResponse);
     296        if ([(NSURL *)url isFileURL]) {
    298297            RetainPtr<CFStringRef> extension = adoptCF(CFURLCopyPathExtension(url));
    299298            if (extension) {
    … …  
    322321
    323322    if (result != originalResult)
    324         wkSetCFURLResponseMIMEType(cfResponse, result.get());
     323        CFURLResponseSetMIMEType(cfResponse, result.get());
    325324}
    326325#endif

  • trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h

    r173710 r194378  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1111 *    documentation and/or other materials provided with the distribution.
    1212 *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
    14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
    17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
    18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
    19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
    20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
    21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     23 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    … …  
    3131#else
    3232enum HTTPConnectionCacheLimitKeys {
     33    kHTTPLoadWidth = 0,
     34    kHTTPPriorityNumLevels = 3,
    3335    kHTTPNumFastLanes = 4,
     36    kHTTPMinimumFastLanePriority = 5,
    3437};
    3538#endif
    3639
    37 extern "C" void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
     40EXTERN_C int _CFNetworkHTTPConnectionCacheGetLimit(HTTPConnectionCacheLimitKeys);
     41EXTERN_C void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
    3842
    39 #endif
     43#endif // CFNetworkConnectionCacheSPI_h

  • trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

    r194318 r194378  
    2727#define CFNetworkSPI_h
    2828
     29#include "CFNetworkConnectionCacheSPI.h"
    2930#include <CFNetwork/CFNetwork.h>
    3031
    3132#if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
    3233
    33 #include <CFNetwork/CFHTTPCookies.h>
    3434#include <CFNetwork/CFHTTPCookiesPriv.h>
     35#include <CFNetwork/CFProxySupportPriv.h>
    3536#include <CFNetwork/CFURLCachePriv.h>
     37#include <CFNetwork/CFURLConnectionPriv.h>
     38#include <CFNetwork/CFURLCredentialStorage.h>
    3639#include <CFNetwork/CFURLProtocolPriv.h>
    37 #include <CFNetwork/CFURLRequest.h>
     40#include <CFNetwork/CFURLRequestPriv.h>
     41#include <CFNetwork/CFURLResponsePriv.h>
     42#include <CFNetwork/CFURLStorageSession.h>
    3843
    3944// FIXME: Remove the defined(__OBJC__)-guard onnce we fix <rdar://problem/19033610>.
    … …  
    5459#else // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
    5560
    56 #if defined(__OBJC__)
    57 @interface NSURLSessionTask (TimingData)
    58 - (NSDictionary *)_timingData;
    59 @end
    60 #endif
    61 
    6261typedef CF_ENUM(int64_t, _TimingDataOptions)
    6362{
    … …  
    6564};
    6665
    67 typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
    6866typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
    6967typedef const struct _CFURLCache* CFURLCacheRef;
    70 typedef const struct _CFURLRequest *CFURLRequestRef;
     68typedef const struct _CFURLCredential* CFURLCredentialRef;
     69typedef const struct _CFURLRequest* CFURLRequestRef;
    7170typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
    72 typedef const struct __CFData *CFDataRef;
     71typedef const struct __CFData* CFDataRef;
     72typedef struct _CFURLConnection* CFURLConnectionRef;
     73typedef struct _CFURLCredentialStorage* CFURLCredentialStorageRef;
     74typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
     75typedef struct _CFURLRequest* CFMutableURLRequestRef;
     76typedef struct _CFURLResponse* CFURLResponseRef;
     77typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
     78typedef CFIndex CFURLRequestPriority;
     79typedef int CFHTTPCookieStorageAcceptPolicy;
    7380
    7481#ifdef __BLOCKS__
    7582typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
     83#endif
     84
     85#if defined(__OBJC__)
     86@interface NSURLRequest ()
     87- (void)_setProperty:(id)value forKey:(NSString *)key;
     88@end
     89
     90@interface NSURLResponse ()
     91+ (NSURLResponse *)_responseWithCFURLResponse:(CFURLResponseRef)response;
     92- (CFURLResponseRef)_CFURLResponse;
     93- (NSDate *)_lastModifiedDate;
     94@end
     95
     96@interface NSURLSessionTask (TimingData)
     97- (NSDictionary *)_timingData;
     98@end
    7699#endif
    77100
    … …  
    103126
    104127EXTERN_C CFStringRef const kCFHTTPCookieLocalFileDomain;
     128EXTERN_C const CFStringRef kCFURLRequestAllowAllPOSTCaching;
     129
     130#if !PLATFORM(WIN)
     131EXTERN_C const CFStringRef _kCFURLConnectionPropertyShouldSniff;
     132#endif
     133
     134EXTERN_C CFHTTPCookieStorageRef _CFHTTPCookieStorageGetDefault(CFAllocatorRef);
     135EXTERN_C void CFHTTPCookieStorageSetCookieAcceptPolicy(CFHTTPCookieStorageRef, CFHTTPCookieStorageAcceptPolicy);
     136EXTERN_C void _CFNetworkSetOverrideSystemProxySettings(CFDictionaryRef);
     137EXTERN_C CFURLCredentialStorageRef CFURLCredentialStorageCreate(CFAllocatorRef);
     138EXTERN_C CFURLCredentialRef CFURLCredentialStorageCopyDefaultCredentialForProtectionSpace(CFURLCredentialStorageRef, CFURLProtectionSpaceRef);
     139EXTERN_C CFURLRequestPriority CFURLRequestGetRequestPriority(CFURLRequestRef);
     140EXTERN_C void _CFURLRequestSetProtocolProperty(CFURLRequestRef, CFStringRef, CFTypeRef);
     141EXTERN_C void CFURLRequestSetRequestPriority(CFURLRequestRef, CFURLRequestPriority);
     142EXTERN_C void CFURLRequestSetShouldPipelineHTTP(CFURLRequestRef, Boolean, Boolean);
     143EXTERN_C void _CFURLRequestSetStorageSession(CFMutableURLRequestRef, CFURLStorageSessionRef);
     144EXTERN_C CFStringRef CFURLResponseCopySuggestedFilename(CFURLResponseRef);
     145EXTERN_C CFHTTPMessageRef CFURLResponseGetHTTPResponse(CFURLResponseRef);
     146EXTERN_C CFStringRef CFURLResponseGetMIMEType(CFURLResponseRef);
     147EXTERN_C CFDictionaryRef _CFURLResponseGetSSLCertificateContext(CFURLResponseRef);
     148EXTERN_C CFURLRef CFURLResponseGetURL(CFURLResponseRef);
     149EXTERN_C void CFURLResponseSetMIMEType(CFURLResponseRef, CFStringRef);
     150EXTERN_C CFHTTPCookieStorageRef _CFURLStorageSessionCopyCookieStorage(CFAllocatorRef, CFURLStorageSessionRef);
    105151
    106152// FIXME: We should only forward declare this SPI when building for iOS without the Apple Internal SDK.

  • trunk/Source/WebKit/mac/ChangeLog

    r194322 r194378  
     12015-12-22  Andy Estes  <aestes@apple.com>
     2
     3        [CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=152463
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
     9        declared in CFNetworkSPI.h.
     10
     11        * Plugins/Hosted/HostedNetscapePluginStream.mm:
     12        (WebKit::HostedNetscapePluginStream::didReceiveResponse):
     13        * Plugins/WebNetscapePluginStream.mm:
     14        (WebNetscapePluginStream::didReceiveResponse):
     15        * WebCoreSupport/WebSystemInterface.mm:
     16        (InitWebCoreSystemInterface): Deleted.
     17        * WebView/WebPreferences.mm:
     18        (+[WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:]):
     19
    1202015-12-20  Dan Bernstein  <mitz@apple.com>
    221

  • trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm

    r192995 r194378  
    3838#import "WebNSURLRequestExtras.h"
    3939#import "WebResourceLoadScheduler.h"
     40#import <WebCore/CFNetworkSPI.h>
    4041#import <WebCore/Document.h>
    4142#import <WebCore/DocumentLoader.h>
    … …  
    190191    }
    191192   
    192     startStream([r URL], expectedContentLength, WKGetNSURLResponseLastModifiedDate(r), [r MIMEType], theHeaders);
     193    startStream([r URL], expectedContentLength, [r _lastModifiedDate], [r MIMEType], theHeaders);
    193194}
    194195

  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm

    r192995 r194378  
    4040#import "WebResourceLoadScheduler.h"
    4141#import <Foundation/NSURLResponse.h>
     42#import <WebCore/CFNetworkSPI.h>
    4243#import <WebCore/Document.h>
    4344#import <WebCore/DocumentLoader.h>
    … …  
    359360    }
    360361   
    361     startStream([r URL], expectedContentLength, WKGetNSURLResponseLastModifiedDate(r), response.mimeType(), theHeaders);
     362    startStream([r URL], expectedContentLength, [r _lastModifiedDate], response.mimeType(), theHeaders);
    362363}
    363364

  • trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

    r191904 r194378  
    4747#endif
    4848    INIT(CALayerEnumerateRectsBeingDrawnWithBlock);
    49 #if !PLATFORM(IOS)
    50     INIT(CGContextGetShouldSmoothFonts);
    51 #endif
    5249    INIT(CGPatternCreateWithImageAndTransform);
    5350#if !PLATFORM(IOS)
    … …  
    5552#endif
    5653    INIT(CopyCONNECTProxyResponse);
    57     INIT(CopyNSURLResponseStatusLine);
    58     INIT(CopyNSURLResponseCertificateChain);
    5954#if !PLATFORM(IOS)
    60     INIT(DrawCapsLockIndicator);
    6155    INIT(DrawBezeledTextArea);
    6256    INIT(DrawFocusRing);
    … …  
    6660    INIT(DrawMediaSliderTrack);
    6761#endif
    68     INIT(GetHTTPRequestPriority);
    69     INIT(GetNSURLResponseLastModifiedDate);
    7062    INIT(GetWebDefaultCFStringEncoding);
    7163#if !PLATFORM(IOS)
    … …  
    7466    INIT(GetNSEventKeyChar);
    7567    INIT(HitTestMediaUIPart);
    76 #endif
    77     INIT(InitializeMaximumHTTPConnectionCountPerHost);
    78 #if !PLATFORM(IOS)
    7968    INIT(MeasureMediaUIPart);
    8069    INIT(CreateMediaUIBackgroundView);
    … …  
    8271    INIT(WindowSetAlpha);
    8372    INIT(WindowSetScaledFrame);
    84     INIT(SetCGFontRenderingMode);
    8573#endif
    8674    INIT(SetCONNECTProxyAuthorizationForStream);
    … …  
    8977    INIT(SetDragImage);
    9078#endif
    91     INIT(SetHTTPRequestMaximumPriority);
    92     INIT(SetHTTPRequestPriority);
    93     INIT(SetHTTPRequestMinimumFastLanePriority);
    94     INIT(HTTPRequestEnablePipelining);
    95     INIT(SetNSURLRequestShouldContentSniff);
    9679    INIT(CGContextIsPDFContext);
    9780#if ENABLE(VIDEO) && !PLATFORM(IOS)
    … …  
    10083    INIT(QTMovieMaxTimeLoaded);
    10184    INIT(QTMovieMaxTimeLoadedChangeNotification);
    102     INIT(QTMovieMaxTimeSeekable);
    10385    INIT(QTMovieGetType);
    10486    INIT(QTMovieHasClosedCaptions);
    … …  
    10688    INIT(QTMovieSetShowClosedCaptions);
    10789    INIT(QTMovieSelectPreferredAlternates);
    108     INIT(QTMovieViewSetDrawSynchronously);
    10990    INIT(QTGetSitesInMediaDownloadCache);
    11091    INIT(QTClearMediaDownloadCacheForSite);
    … …  
    11697    INIT(CopyDefaultSearchProviderDisplayName);
    11798    INIT(Cursor);
    118 #endif
    119 
    120 #if USE(CFNETWORK)
    121     INIT(GetDefaultHTTPCookieStorage);
    122     INIT(CopyCredentialFromCFPersistentStorage);
    123     INIT(SetCFURLRequestShouldContentSniff);
    124     INIT(SetRequestStorageSession);
    125 #endif
    126 
    127 #if !PLATFORM(IOS)
    12899    INIT(SpeechSynthesisGetVoiceIdentifiers);
    129100    INIT(SpeechSynthesisGetDefaultVoiceIdentifierForLocale);
    … …  
    141112    INIT(CreatePrivateStorageSession);
    142113    INIT(CopyRequestWithStorageSession);
    143     INIT(CopyHTTPCookieStorage);
    144114    INIT(GetHTTPCookieAcceptPolicy);
    145115    INIT(HTTPCookies);
    … …  
    149119    INIT(DeleteHTTPCookie);
    150120
    151     INIT(GetCFURLResponseMIMEType);
    152     INIT(GetCFURLResponseURL);
    153     INIT(GetCFURLResponseHTTPResponse);
    154     INIT(CopyCFURLResponseSuggestedFilename);
    155     INIT(SetCFURLResponseMIMEType);
    156 
    157121#if !PLATFORM(IOS)
    158122    INIT(SetMetadataURL);
    159 #endif
    160 
    161     INIT(CFURLRequestAllowAllPostCaching);
    162 
    163 #if !PLATFORM(IOS)
    164123    INIT(NSElasticDeltaForTimeDelta);
    165124    INIT(NSElasticDeltaForReboundDelta);

  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r194000 r194378  
    4242#import <WebCore/ApplicationCacheStorage.h>
    4343#import <WebCore/AudioSession.h>
     44#import <WebCore/CFNetworkSPI.h>
    4445#import <WebCore/NetworkStorageSession.h>
    4546#import <WebCore/PlatformCookieJar.h>
    … …  
    5152#import <wtf/RetainPtr.h>
    5253#import <wtf/RunLoop.h>
    53 
    54 enum {
    55     NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3
    56 };
    5754
    5855using namespace WebCore;
    … …  
    17681765    RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage();
    17691766    ASSERT(cookieStorage); // Will fail when building without USE(CFNETWORK) and NetworkStorageSession::switchToNewTestingSession() was not called beforehand.
    1770     WKSetHTTPCookieAcceptPolicy(cookieStorage.get(), policy);
     1767    CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
    17711768}
    17721769

  • trunk/Source/WebKit2/ChangeLog

    r194367 r194378  
     12015-12-22  Andy Estes  <aestes@apple.com>
     2
     3        [CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=152463
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
     9        declared in CFNetworkSPI.h.
     10
     11        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     12        (WebKit::initializeNetworkSettings):
     13        * NetworkProcess/mac/NetworkProcessMac.mm:
     14        (WebKit::overrideSystemProxies):
     15        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
     16        (WebKit::WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts):
     17        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
     18        (InitWebCoreSystemInterface):
     19
    1202015-12-22  Brent Fulgham  <bfulgham@apple.com>
    221

  • trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r194318 r194378  
    5252    static const unsigned preferredConnectionCount = 6;
    5353
    54     WKInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
     54    _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
    5555
    5656    Boolean keyExistsAndHasValidFormat = false;
    … …  
    6060
    6161    if (WebCore::ResourceRequest::resourcePrioritiesEnabled()) {
    62         WKSetHTTPRequestMaximumPriority(toPlatformRequestPriority(WebCore::ResourceLoadPriority::Highest));
    63         WKSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(WebCore::ResourceLoadPriority::Medium));
     62        _CFNetworkHTTPConnectionCacheSetLimit(kHTTPPriorityNumLevels, toPlatformRequestPriority(WebCore::ResourceLoadPriority::Highest));
     63#if PLATFORM(IOS)
     64        _CFNetworkHTTPConnectionCacheSetLimit(kHTTPMinimumFastLanePriority, toPlatformRequestPriority(WebCore::ResourceLoadPriority::Medium));
     65#endif
    6466    }
    6567}

  • trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm

    r192697 r194378  
    3737#import "SecItemShim.h"
    3838#import "StringUtilities.h"
     39#import <WebCore/CFNetworkSPI.h>
    3940#import <WebCore/CertificateInfo.h>
    4041#import <WebCore/FileSystem.h>
    … …  
    9697
    9798    if ([proxySettings count] > 0)
    98         WKCFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
     99        _CFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
    99100}
    100101

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

    r191998 r194378  
    3232#include "WebPage.h"
    3333#include "WebProcess.h"
     34#include <WebCore/CFNetworkSPI.h>
    3435#include <WebCore/Frame.h>
    3536#include <WebCore/FrameLoader.h>
    … …  
    7071
    7172    if (RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage())
    72         WKSetHTTPCookieAcceptPolicy(cookieStorage.get(), policy);
     73        CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
    7374
    7475    for (const auto& session : SessionTracker::storageSessionMap().values()) {
    7576        if (session)
    76             WKSetHTTPCookieAcceptPolicy(session->cookieStorage().get(), policy);
     77            CFHTTPCookieStorageSetCookieAcceptPolicy(session->cookieStorage().get(), policy);
    7778    }
    7879}

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

    r191904 r194378  
    4141#endif
    4242        INIT(CALayerEnumerateRectsBeingDrawnWithBlock);
    43         INIT(CGContextGetShouldSmoothFonts);
    4443        INIT(CGPatternCreateWithImageAndTransform);
    4544#if !PLATFORM(IOS)
    … …  
    4746#endif
    4847        INIT(CopyCONNECTProxyResponse);
    49         INIT(CopyNSURLResponseStatusLine);
    50         INIT(CopyNSURLResponseCertificateChain);
    5148#if !PLATFORM(IOS)
    5249        INIT(DrawBezeledTextArea);
    53         INIT(DrawCapsLockIndicator);
    5450        INIT(DrawFocusRing);
    5551        INIT(DrawFocusRingAtTime);
    … …  
    5753        INIT(DrawMediaSliderTrack);
    5854        INIT(DrawMediaUIPart);
    59 #endif
    60         INIT(GetHTTPRequestPriority);
    61         INIT(GetNSURLResponseLastModifiedDate);
    62 #if !PLATFORM(IOS)
    6355        INIT(SignedPublicKeyAndChallengeString);
    6456#endif
    … …  
    6961        INIT(GetNSEventKeyChar);
    7062        INIT(HitTestMediaUIPart);
    71 #endif
    72         INIT(InitializeMaximumHTTPConnectionCountPerHost);
    73         INIT(HTTPRequestEnablePipelining);
    74 #if !PLATFORM(IOS)
    7563        INIT(MeasureMediaUIPart);
    7664        INIT(QTIncludeOnlyModernMediaFileTypes);
    … …  
    8068        INIT(QTMovieMaxTimeLoaded);
    8169        INIT(QTMovieMaxTimeLoadedChangeNotification);
    82         INIT(QTMovieMaxTimeSeekable);
    8370        INIT(QTMovieResolvedURL);
    8471        INIT(QTMovieSelectPreferredAlternates);
    8572        INIT(QTMovieSetShowClosedCaptions);
    86         INIT(QTMovieViewSetDrawSynchronously);
    8773        INIT(QTGetSitesInMediaDownloadCache);
    8874        INIT(QTClearMediaDownloadCacheForSite);
    8975        INIT(QTClearMediaDownloadCache);
    90         INIT(SetCGFontRenderingMode);
    9176#endif
    9277        INIT(SetCONNECTProxyAuthorizationForStream);
    … …  
    9580        INIT(SetDragImage);
    9681#endif
    97         INIT(SetHTTPRequestMaximumPriority);
    98         INIT(SetHTTPRequestPriority);
    99         INIT(SetHTTPRequestMinimumFastLanePriority);
    100         INIT(SetNSURLRequestShouldContentSniff);
    10182        INIT(CreatePrivateStorageSession);
    10283        INIT(CopyRequestWithStorageSession);
    103         INIT(CopyHTTPCookieStorage);
    10484        INIT(GetHTTPCookieAcceptPolicy);
    105         INIT(SetHTTPCookieAcceptPolicy);
    10685        INIT(HTTPCookies);
    10786        INIT(HTTPCookiesForURL);
    … …  
    11291#if !PLATFORM(IOS)
    11392        INIT(SetMetadataURL);
    114 #endif // !PLATFORM(IOS)
    115 
    116 #if !PLATFORM(IOS)
    11793        INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
    11894        INIT(CopyDefaultSearchProviderDisplayName);
    … …  
    12096        INIT(WindowSetScaledFrame);
    12197        INIT(WindowSetAlpha);
    122 #endif // !PLATFORM(IOS)
    123 
    124 #if USE(CFNETWORK)
    125         INIT(GetDefaultHTTPCookieStorage);
    126         INIT(CopyCredentialFromCFPersistentStorage);
    127         INIT(SetCFURLRequestShouldContentSniff);
    128         INIT(SetRequestStorageSession);
    129 #endif
    130 
    131 #if !PLATFORM(IOS)
    13298        INIT(SpeechSynthesisGetVoiceIdentifiers);
    13399        INIT(SpeechSynthesisGetDefaultVoiceIdentifierForLocale);
    … …  
    142108        INIT(CreateAXUIElementRef);
    143109        INIT(UnregisterUniqueIdForElement);
    144 #endif
    145 
    146         INIT(GetCFURLResponseMIMEType);
    147         INIT(GetCFURLResponseURL);
    148         INIT(GetCFURLResponseHTTPResponse);
    149         INIT(CopyCFURLResponseSuggestedFilename);
    150         INIT(SetCFURLResponseMIMEType);
    151 
    152         INIT(CFURLRequestAllowAllPostCaching);
    153 
    154 #if !PLATFORM(IOS)
    155110        INIT(NSElasticDeltaForTimeDelta);
    156111        INIT(NSElasticDeltaForReboundDelta);
Note: See TracChangeset for help on using the changeset viewer.