Changeset 163449 in webkit

Timestamp:

Feb 5, 2014 9:13:57 AM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Expose more WKWebProcessPlugInFrame properties
​https://bugs.webkit.org/show_bug.cgi?id=128240

Reviewed by Anders Carlsson.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Declared new properties.
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:

(-[WKWebProcessPlugInFrame URL]): Added.
(-[WKWebProcessPlugInFrame childFrames]): Added.
(-[WKWebProcessPlugInFrame containsAnyFormElements]): Added.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-05  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Expose more WKWebProcessPlugInFrame properties
+        https://bugs.webkit.org/show_bug.cgi?id=128240
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Declared new properties.
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+        (-[WKWebProcessPlugInFrame URL]): Added.
+        (-[WKWebProcessPlugInFrame childFrames]): Added.
+        (-[WKWebProcessPlugInFrame containsAnyFormElements]): Added.
+
 2014-02-05  Dan Bernstein  <mitz@apple.com>
 

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

@@ -39 +39 @@
 @interface WKWebProcessPlugInFrame : NSObject
 
+@property (nonatomic, readonly) NSURL *URL;
+@property (nonatomic, readonly) NSArray *childFrames;
+@property (nonatomic, readonly) BOOL containsAnyFormElements;
+
 - (JSContext *)jsContextForWorld:(WKWebProcessPlugInScriptWorld *)world;
 - (WKWebProcessPlugInHitTestResult *)hitTest:(CGPoint)point;

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

@@ -29 +29 @@
 #if WK_API_ENABLED
 
+#import "WKNSArray.h"
+#import "WKNSURLExtras.h"
 #import "WKWebProcessPlugInHitTestResultInternal.h"
 #import "WKWebProcessPlugInNodeHandleInternal.h"
@@ -64 +66 @@
 }
 
+- (NSURL *)URL
+{
+    return [NSURL _web_URLWithWTFString:_frame->url()];
+}
+
+- (NSArray *)childFrames
+{
+    return [wrapper(*_frame->childFrames().leakRef()) autorelease];
+}
+
+- (BOOL)containsAnyFormElements
+{
+    return !!_frame->containsAnyFormElements();
+}
+
 #pragma mark WKObject protocol implementation