Title: [213551] trunk/Source/WebKit/mac
- Revision
- 213551
- Author
- [email protected]
- Date
- 2017-03-07 16:41:27 -0800 (Tue, 07 Mar 2017)
Log Message
Additional DataInteraction Support
https://bugs.webkit.org/show_bug.cgi?id=169316
<rdar://problem/30884234>
Reviewed by Wenson Hsieh.
Add stub implementations to WebView for methods that handle data interaction
* WebView/WebView.mm:
(-[WebView _enteredDataInteraction:client:global:operation:]):
(-[WebView _updatedDataInteraction:client:global:operation:]):
(-[WebView _exitedDataInteraction:client:global:operation:]):
(-[WebView _performDataInteraction:client:global:operation:]):
(-[WebView _endedDataInteraction:global:]):
* WebView/WebViewPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (213550 => 213551)
--- trunk/Source/WebKit/mac/ChangeLog 2017-03-08 00:31:32 UTC (rev 213550)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-08 00:41:27 UTC (rev 213551)
@@ -1,3 +1,21 @@
+2017-03-07 Megan Gardner <[email protected]>
+
+ Additional DataInteraction Support
+ https://bugs.webkit.org/show_bug.cgi?id=169316
+ <rdar://problem/30884234>
+
+ Reviewed by Wenson Hsieh.
+
+ Add stub implementations to WebView for methods that handle data interaction
+
+ * WebView/WebView.mm:
+ (-[WebView _enteredDataInteraction:client:global:operation:]):
+ (-[WebView _updatedDataInteraction:client:global:operation:]):
+ (-[WebView _exitedDataInteraction:client:global:operation:]):
+ (-[WebView _performDataInteraction:client:global:operation:]):
+ (-[WebView _endedDataInteraction:global:]):
+ * WebView/WebViewPrivate.h:
+
2017-03-07 Dean Jackson <[email protected]>
Some platforms won't be able to create a GPUDevice
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (213550 => 213551)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-08 00:31:32 UTC (rev 213550)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-08 00:41:27 UTC (rev 213551)
@@ -1799,6 +1799,11 @@
{
return _private->textIndicatorData;
}
+
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebViewAdditions.mm>)
+#include <WebKitAdditions/WebViewAdditions.mm>
+#endif
+
#else
- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
{
@@ -1811,6 +1816,24 @@
{
return nil;
}
+- (uint64_t)_enteredDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+ return 0;
+}
+
+- (uint64_t)_updatedDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+ return 0;
+}
+- (void)_exitedDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+}
+- (void)_performDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+}
+- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)globalPosition
+{
+}
#endif // ENABLE(DATA_INTERACTION) && defined(__cplusplus)
static NSMutableSet *knownPluginMIMETypes()
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (213550 => 213551)
--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2017-03-08 00:31:32 UTC (rev 213550)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2017-03-08 00:41:27 UTC (rev 213551)
@@ -465,6 +465,11 @@
- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition;
- (WebUITextIndicatorData *)_getDataInteractionData;
+- (uint64_t)_enteredDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
+- (uint64_t)_updatedDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
+- (void)_exitedDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
+- (void)_performDataInteraction:(id)dataInteraction client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
+- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)clientPosition;
#if TARGET_OS_IPHONE
// Deprecated. Use -[WebDataSource _quickLookContent] instead.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
