Title: [219036] trunk/Source/WebKit2
- Revision
- 219036
- Author
- [email protected]
- Date
- 2017-06-30 20:08:31 -0700 (Fri, 30 Jun 2017)
Log Message
Unreviewed mac build fix.
* UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:
* UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (219035 => 219036)
--- trunk/Source/WebKit2/ChangeLog 2017-07-01 02:56:04 UTC (rev 219035)
+++ trunk/Source/WebKit2/ChangeLog 2017-07-01 03:08:31 UTC (rev 219036)
@@ -1,5 +1,12 @@
2017-06-30 Megan Gardner <[email protected]>
+ Unreviewed mac build fix.
+
+ * UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:
+ * UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h:
+
+2017-06-30 Megan Gardner <[email protected]>
+
Add API to get WKActivatedElementInfo
https://bugs.webkit.org/show_bug.cgi?id=174001
<rdar://problem/29165518>
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm (219035 => 219036)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm 2017-07-01 02:56:04 UTC (rev 219035)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm 2017-07-01 03:08:31 UTC (rev 219036)
@@ -54,6 +54,7 @@
#endif
}
+#if PLATFORM(IOS)
+ (instancetype)activatedElementInfoWithInteractionInformationAtPosition:(const WebKit::InteractionInformationAtPosition&)information
{
return [[[self alloc] _initWithInteractionInformationAtPosition:information] autorelease];
@@ -83,6 +84,7 @@
return self;
}
+#endif
- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title ID:(NSString *)ID rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image
{
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h (219035 => 219036)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h 2017-07-01 02:56:04 UTC (rev 219035)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h 2017-07-01 03:08:31 UTC (rev 219036)
@@ -23,7 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if PLATFORM(IOS)
#import "InteractionInformationAtPosition.h"
+#endif
#import "_WKActivatedElementInfo.h"
#if WK_API_ENABLED
@@ -34,8 +36,10 @@
@interface _WKActivatedElementInfo ()
+#if PLATFORM(IOS)
+ (instancetype)activatedElementInfoWithInteractionInformationAtPosition:(const WebKit::InteractionInformationAtPosition&)information;
- (instancetype)_initWithInteractionInformationAtPosition:(const WebKit::InteractionInformationAtPosition&)information;
+#endif
- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title ID:(NSString *)ID rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image;
- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title ID:(NSString *)ID rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image userInfo:(NSDictionary *)userInfo;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
