No way to get a WKWebProcessPlugInFrame’s parent frame

https://bugs.webkit.org/show_bug.cgi?id=144705

Reviewed by Sam Weinig.

* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
(-[WKWebProcessPlugInFrame _parentFrame]): Added this getter.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h: Declared new
_parentFrame property.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 40c50c10f11e1215ecb7b06045777a9e0b2bbf56..f83ff35428ef85fc7fabfc0b0d457434266d40e1 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2015-05-06  Dan Bernstein  <mitz@apple.com>
+
+        No way to get a WKWebProcessPlugInFrame’s parent frame
+        https://bugs.webkit.org/show_bug.cgi?id=144705
+
+        Reviewed by Sam Weinig.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+        (-[WKWebProcessPlugInFrame _parentFrame]): Added this getter.
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h: Declared new
+        _parentFrame property.
+
 2015-05-06  Timothy Horton  <timothy_horton@apple.com>
 
         Fix the build.

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm b/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
index 25ae58b7d32c0f3dd1b9739468d9eea8a59363df..51887394378b476990b47f11d973204ee99e1997 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
@@ -103,6 +103,12 @@ using namespace WebKit;
     return [wrapper(API::FrameHandle::create(_frame->frameID()).leakRef()) autorelease];
 }
 
+- (WKWebProcessPlugInFrame *)_parentFrame
+{
+    WebFrame *parentFrame = _frame->parentFrame();
+    return parentFrame ? wrapper(*parentFrame) : nil;
+}
+
 - (BOOL)_hasCustomContentProvider
 {
     if (!_frame->isMainFrame())

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h b/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h
index f79d2b1c0849730541aaea05b142d0d69f8077be..1cfd59c883b077335a545602e1b4314b44b17b8d 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h
@@ -39,6 +39,8 @@
 @property (nonatomic, readonly) NSArray *_certificateChain;
 @property (nonatomic, readonly) NSURL *_provisionalURL;
 
+@property (nonatomic, readonly) WKWebProcessPlugInFrame *_parentFrame;
+
 @end
 
 #endif // WK_API_ENABLED