Changeset 164325 in webkit
- Timestamp:
- Feb 18, 2014 2:58:29 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r164315 r164325 1 2014-02-18 Anders Carlsson <andersca@apple.com> 2 3 Add SPI for allowing HTTPS certificates 4 https://bugs.webkit.org/show_bug.cgi?id=129002 5 6 Reviewed by Dan Bernstein. 7 8 * UIProcess/API/Cocoa/WKProcessClass.mm: 9 (-[WKProcessClass _setAllowsSpecificHTTPSCertificate:forHost:]): 10 * UIProcess/API/Cocoa/WKProcessClassInternal.h: 11 * UIProcess/API/Cocoa/WKProcessClassPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h. 12 * WebKit2.xcodeproj/project.pbxproj: 13 1 14 2014-02-18 Anders Carlsson <andersca@apple.com> 2 15 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm
r164300 r164325 32 32 #import "WKObject.h" 33 33 #import "WKProcessClassConfigurationPrivate.h" 34 #import "WebCertificateInfo.h" 34 35 #import "WebContext.h" 36 #import <WebCore/CertificateInfo.h> 35 37 #import <wtf/RetainPtr.h> 36 38 … … 96 98 @end 97 99 100 @implementation WKProcessClass (WKPrivate) 101 102 - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host 103 { 104 _context->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).get(), host); 105 } 106 107 @end 108 98 109 #endif // WK_API_ENABLED -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h
r162876 r164325 24 24 */ 25 25 26 #import "WKProcessClass .h"26 #import "WKProcessClassPrivate.h" 27 27 28 28 #if WK_API_ENABLED -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h
r164315 r164325 24 24 */ 25 25 26 #import "WKProcessClass.h"26 #import <WebKit2/WKProcessClass.h> 27 27 28 28 #if WK_API_ENABLED 29 29 30 #import "WKObject.h" 31 #import "WebContext.h" 30 @interface WKProcessClass (WKPrivate) 32 31 33 namespace WebKit { 32 - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host; 34 33 35 inline WKProcessClass *wrapper(WebContext& context)36 {37 ASSERT([context.wrapper() isKindOfClass:[WKProcessClass class]]);38 return (WKProcessClass *)context.wrapper();39 }40 41 }42 43 @interface WKProcessClass () <WKObject> {44 @package45 RetainPtr<WKProcessClassConfiguration> _configuration;46 47 API::ObjectStorage<WebKit::WebContext> _context;48 }49 34 @end 50 35 51 #endif // WK_API_ENABLED36 #endif -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r164315 r164325 203 203 1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */; }; 204 204 1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */; }; 205 1A6509CE18B4146200614332 /* WKProcessClassPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6509CD18B4146200614332 /* WKProcessClassPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 205 206 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */; }; 206 207 1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; }; … … 1873 1874 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateInfo.h; sourceTree = "<group>"; }; 1874 1875 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; }; 1876 1A6509CD18B4146200614332 /* WKProcessClassPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassPrivate.h; sourceTree = "<group>"; }; 1875 1877 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIHistoryClient.h; sourceTree = "<group>"; }; 1876 1878 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; }; … … 4379 4381 1A158418189044F50017616C /* WKProcessClass.h */, 4380 4382 1A158417189044F50017616C /* WKProcessClass.mm */, 4383 1A6509CD18B4146200614332 /* WKProcessClassPrivate.h */, 4381 4384 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */, 4382 4385 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */, … … 6572 6575 BC09B8F9147460F7005F5625 /* WebContextConnectionClient.h in Headers */, 6573 6576 BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */, 6577 1A6509CE18B4146200614332 /* WKProcessClassPrivate.h in Headers */, 6574 6578 51871B5C127CB89D00F76232 /* WebContextMenu.h in Headers */, 6575 6579 BC032D7710F4378D0058C15A /* WebContextMenuClient.h in Headers */,
Note: See TracChangeset
for help on using the changeset viewer.