Changeset 166935 in webkit

Timestamp:

Apr 8, 2014 10:45:50 AM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Add a _certificateChain property to WKWebProcessPlugInFrame
​https://bugs.webkit.org/show_bug.cgi?id=131370

Reviewed by Anders Carlsson.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:

(-[WKWebProcessPlugInFrame _certificateChain]): Added this getter, which uses the new
WebFrame::certificateInfo.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h:
• WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::certificateInfo): Added this getter.

• WebProcess/WebPage/WebFrame.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm (modified) (2 diffs)
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h (modified) (1 diff)
• WebProcess/WebPage/WebFrame.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebFrame.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-08  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Add a _certificateChain property to WKWebProcessPlugInFrame
+        https://bugs.webkit.org/show_bug.cgi?id=131370
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+        (-[WKWebProcessPlugInFrame _certificateChain]): Added this getter, which uses the new
+        WebFrame::certificateInfo.
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::certificateInfo): Added this getter.
+        * WebProcess/WebPage/WebFrame.h:
+
 2014-04-08  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm

@@ -38 +38 @@
 #import "_WKFrameHandleInternal.h"
 #import <JavaScriptCore/JSValue.h>
+#import <WebCore/CertificateInfo.h>
 #import <WebCore/IntPoint.h>
 
@@ -111 +112 @@
 }
 
+- (NSArray *)_certificateChain
+{
+    return (NSArray *)_frame->certificateInfo().certificateChain();
+}
+
 #pragma mark WKObject protocol implementation
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h

@@ -37 +37 @@
 
 @property (nonatomic, readonly) BOOL _hasCustomContentProvider;
+@property (nonatomic, readonly) NSArray *_certificateChain;
 
 @end

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -45 +45 @@
 #include <JavaScriptCore/JSValueRef.h>
 #include <WebCore/ArchiveResource.h>
+#include <WebCore/CertificateInfo.h>
 #include <WebCore/Chrome.h>
 #include <WebCore/DocumentLoader.h>
@@ -402 +403 @@
 }
 
+const WebCore::CertificateInfo& WebFrame::certificateInfo() const
+{
+    if (!m_coreFrame)
+        return std::move(CertificateInfo());
+
+    DocumentLoader* documentLoader = m_coreFrame->loader().documentLoader();
+    if (!documentLoader)
+        return std::move(CertificateInfo());
+
+    return std::move(CertificateInfo(documentLoader->response()));
+}
+
 String WebFrame::innerText() const
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h

@@ -44 +44 @@
 
 namespace WebCore {
+class CertificateInfo;
 class Frame;
 class HTMLFrameOwnerElement;
@@ -92 +93 @@
     String name() const;
     String url() const;
+    const WebCore::CertificateInfo& certificateInfo() const;
     String innerText() const;
     bool isFrameSet() const;