Changeset 267387 in webkit

Timestamp:

Sep 21, 2020, 5:37:16 PM (6 years ago)

Author:

timothy@apple.com

Message:

Add some WKWebProcessPlugInFrame SPI needed by Safari.
​https://bugs.webkit.org/show_bug.cgi?id=216809
rdar://problem/69336928

Reviewed by Brian Weinstein.

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

(+[WKWebProcessPlugInFrame lookUpFrameFromJSContext:]): Added.
(-[WKWebProcessPlugInFrame _securityOrigin]): Added.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h:

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-21  Timothy Hatcher  <timothy@apple.com>
+
+        Add some WKWebProcessPlugInFrame SPI needed by Safari.
+        https://bugs.webkit.org/show_bug.cgi?id=216809
+        rdar://problem/69336928
+
+        Reviewed by Brian Weinstein.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+        (+[WKWebProcessPlugInFrame lookUpFrameFromJSContext:]): Added.
+        (-[WKWebProcessPlugInFrame _securityOrigin]): Added.
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h:
+
 2020-09-21  Andres Gonzalez  <andresg_22@apple.com>
 

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

@@ -51 +51 @@
 {
     return wrapper(WebKit::WebProcess::singleton().webFrame(handle->_frameHandle->frameID()));
+}
+
++ (instancetype)lookUpFrameFromJSContext:(JSContext *)context
+{
+    return wrapper(WebKit::WebFrame::frameForContext(context.JSGlobalContextRef));
 }
 
@@ -109 +114 @@
 {
     return wrapper(API::FrameHandle::create(_frame->frameID()));
+}
+
+- (NSString *)_securityOrigin
+{
+    auto* coreFrame = _frame->coreFrame();
+    if (!coreFrame)
+        return nil;
+    return coreFrame->document()->securityOrigin().toString();
 }
 

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

@@ -26 +26 @@
 #import "WKWebProcessPlugInFrame.h"
 
+@class JSContext;
 @class WKWebProcessPlugInBrowserContextController;
 
@@ -31 +32 @@
 
 + (instancetype)lookUpFrameFromHandle:(_WKFrameHandle *)handle;
++ (instancetype)lookUpFrameFromJSContext:(JSContext *)context;
 
 @property (nonatomic, readonly) WKWebProcessPlugInBrowserContextController *_browserContextController;
@@ -38 +40 @@
 @property (nonatomic, readonly) SecTrustRef _serverTrust;
 @property (nonatomic, readonly) NSURL *_provisionalURL;
+@property (nonatomic, readonly) NSString *_securityOrigin;
 
 @property (nonatomic, readonly) WKWebProcessPlugInFrame *_parentFrame;