Changeset 164330 in webkit

Timestamp:

Feb 18, 2014 4:36:10 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add more new SPI methods
​https://bugs.webkit.org/show_bug.cgi?id=129009

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _certificateChain]):
(-[WKWebView _committedURL]):
(-[WKWebView _applicationNameForUserAgent]):
(-[WKWebView _setApplicationNameForUserAgent:]):

• UIProcess/API/Cocoa/WKWebViewPrivate.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-18  Anders Carlsson  <andersca@apple.com>
+
+        Add more new SPI methods
+        https://bugs.webkit.org/show_bug.cgi?id=129009
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _certificateChain]):
+        (-[WKWebView _committedURL]):
+        (-[WKWebView _applicationNameForUserAgent]):
+        (-[WKWebView _setApplicationNameForUserAgent:]):
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
 2014-02-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -43 +43 @@
 #import "WKRemoteObjectRegistryInternal.h"
 #import "WKWebViewConfigurationPrivate.h"
+#import "WebCertificateInfo.h"
 #import "WebContext.h"
 #import "WebBackForwardList.h"
@@ -491 +492 @@
 }
 
+- (NSArray *)_certificateChain
+{
+    if (WebKit::WebFrameProxy* mainFrame = _page->mainFrame())
+        return mainFrame->certificateInfo() ? (NSArray *)mainFrame->certificateInfo()->certificateInfo().certificateChain() : nil;
+
+    return nil;
+}
+
+- (NSURL *)_committedURL
+{
+    return [NSURL _web_URLWithWTFString:_page->pageLoadState().url()];
+}
+
+- (NSString *)_applicationNameForUserAgent
+{
+    return _page->applicationNameForUserAgent();
+}
+
+- (void)_setApplicationNameForUserAgent:(NSString *)applicationNameForUserAgent
+{
+    _page->setApplicationNameForUserAgent(applicationNameForUserAgent);
+}
+
 static inline WebCore::LayoutMilestones layoutMilestones(_WKRenderingProgressEvents events)
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -52 +52 @@
 - (WKNavigation *)_reload;
 
+@property (nonatomic, readonly) NSArray *_certificateChain;
+@property (nonatomic, readonly) NSURL *_committedURL;
+
+@property (copy, setter=_setApplicationNameForUserAgent:) NSString *_applicationNameForUserAgent;
+
 #if TARGET_OS_IPHONE
 @property (nonatomic, setter=_setMinimumLayoutSizeOverride:) CGSize _minimumLayoutSizeOverride;