<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213292] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213292">213292</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 11:16:44 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Data interaction support for WK1
https://bugs.webkit.org/show_bug.cgi?id=169062
Reviewed by Wenson Hsieh.
Source/WebKit/mac:
Support for data interaction in WebKit1
* WebCoreSupport/WebDragClient.mm:
* WebView/WebView.mm:
(-[WebUITextIndicatorData initWithImage:TextIndicatorData:scale:]):
(-[WebUITextIndicatorData initWithImage:scale:]):
(-[WebUITextIndicatorData dealloc]):
(-[WebView _requestStartDataInteraction:globalPosition:]):
(-[WebView _setDataInteractionData:textIndicator:atClientPosition:anchorPoint:action:]):
(-[WebView _getDataInteractionData]):
* WebView/WebViewData.h:
* WebView/WebViewData.mm:
(-[WebViewPrivate dealloc]):
* WebView/WebViewInternal.h:
* WebView/WebViewPrivate.h:
Source/WebKit2:
Allow for separate additions files in WK1 and WK2
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebDragClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatamm">trunk/Source/WebKit/mac/WebView/WebViewData.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-01 Megan Gardner <megan_gardner@apple.com>
+
+ Data interaction support for WK1
+ https://bugs.webkit.org/show_bug.cgi?id=169062
+
+ Reviewed by Wenson Hsieh.
+
+ Support for data interaction in WebKit1
+
+ * WebCoreSupport/WebDragClient.mm:
+ * WebView/WebView.mm:
+ (-[WebUITextIndicatorData initWithImage:TextIndicatorData:scale:]):
+ (-[WebUITextIndicatorData initWithImage:scale:]):
+ (-[WebUITextIndicatorData dealloc]):
+ (-[WebView _requestStartDataInteraction:globalPosition:]):
+ (-[WebView _setDataInteractionData:textIndicator:atClientPosition:anchorPoint:action:]):
+ (-[WebView _getDataInteractionData]):
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate dealloc]):
+ * WebView/WebViewInternal.h:
+ * WebView/WebViewPrivate.h:
+
</ins><span class="cx"> 2017-03-02 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Activate ICE candidate privacy policy
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebDragClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditionsWebKit1.mm>)
+#import <WebKitAdditions/WebDragClientAdditionsWebKit1.mm>
+#endif
+
</ins><span class="cx"> WebDragClient::WebDragClient(WebView* webView)
</span><span class="cx"> : m_webView(webView)
</span><span class="cx"> {
</span><span class="lines">@@ -198,11 +202,11 @@
</span><span class="cx"> void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
</del><ins>+#if !ENABLE(DATA_INTERACTION)
</ins><span class="cx"> void WebDragClient::startDrag(WebCore::DragImage, const IntPoint&, const IntPoint&, const FloatPoint&, DataTransfer&, Frame&, WebCore::DragSourceAction)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> void WebDragClient::beginDrag(DragItem, Frame&, const IntPoint&, const IntPoint&, DataTransfer&, DragSourceAction)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -190,6 +190,7 @@
</span><span class="cx"> #import <WebCore/SecurityPolicy.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><span class="cx"> #import <WebCore/SocketProvider.h>
</span><ins>+#import <WebCore/SoftLinking.h>
</ins><span class="cx"> #import <WebCore/StyleProperties.h>
</span><span class="cx"> #import <WebCore/TextResourceDecoder.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="lines">@@ -238,7 +239,6 @@
</span><span class="cx"> #import <WebCore/AVKitSPI.h>
</span><span class="cx"> #import <WebCore/LookupSPI.h>
</span><span class="cx"> #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</span><del>-#import <WebCore/SoftLinking.h>
</del><span class="cx"> #import <WebCore/TextIndicator.h>
</span><span class="cx"> #import <WebCore/TextIndicatorWindow.h>
</span><span class="cx"> #import <WebCore/WebVideoFullscreenController.h>
</span><span class="lines">@@ -319,6 +319,12 @@
</span><span class="cx"> #import <WebCore/WebPlaybackSessionModelMediaElement.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(DATA_INTERACTION)
+#import <UIKit/UIImage.h>
+SOFT_LINK_FRAMEWORK(UIKit)
+SOFT_LINK_CLASS(UIKit, UIImage)
+#endif
+
</ins><span class="cx"> #if HAVE(TOUCH_BAR) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
</span><span class="cx"> SOFT_LINK_FRAMEWORK(AVKit)
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVFunctionBarPlaybackControlsProvider)
</span><span class="lines">@@ -611,6 +617,65 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#if ENABLE(DATA_INTERACTION)
+@implementation WebUITextIndicatorData
+
+@synthesize dataInteractionImage=_dataInteractionImage;
+@synthesize selectionRectInRootViewCoordinates=_selectionRectInRootViewCoordinates;
+@synthesize textBoundingRectInRootViewCoordinates=_textBoundingRectInRootViewCoordinates;
+@synthesize textRectsInBoundingRectCoordinates=_textRectsInBoundingRectCoordinates;
+@synthesize contentImageWithHighlight=_contentImageWithHighlight;
+@synthesize contentImage=_contentImage;
+
+@end
+
+@implementation WebUITextIndicatorData (WebUITextIndicatorInternal)
+
+- (WebUITextIndicatorData *)initWithImage:(CGImageRef)image textIndicatorData:(WebCore::TextIndicatorData &)indicatorData scale:(CGFloat)scale
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _dataInteractionImage = [[[getUIImageClass() alloc] initWithCGImage:image scale:scale orientation:UIImageOrientationDownMirrored] retain];
+ _selectionRectInRootViewCoordinates = indicatorData.selectionRectInRootViewCoordinates;
+ _textBoundingRectInRootViewCoordinates = indicatorData.textBoundingRectInRootViewCoordinates;
+
+ NSMutableArray *textRectsInBoundingRectCoordinates = [NSMutableArray array];
+ for (auto rect : indicatorData.textRectsInBoundingRectCoordinates)
+ [textRectsInBoundingRectCoordinates addObject:[NSValue valueWithCGRect:rect]];
+ _textRectsInBoundingRectCoordinates = [[NSArray arrayWithArray:textRectsInBoundingRectCoordinates] retain];
+ _contentImageScaleFactor = indicatorData.contentImageScaleFactor;
+ if (indicatorData.contentImageWithHighlight)
+ _contentImageWithHighlight = [[[getUIImageClass() alloc] initWithCGImage:indicatorData.contentImageWithHighlight.get()->nativeImage().get() scale:scale orientation:UIImageOrientationDownMirrored] retain];
+ if (indicatorData.contentImage)
+ _contentImage = [[[getUIImageClass() alloc] initWithCGImage:indicatorData.contentImage.get()->nativeImage().get() scale:scale orientation:UIImageOrientationDownMirrored] retain];
+
+ return self;
+}
+
+- (WebUITextIndicatorData *)initWithImage:(CGImageRef)image scale:(CGFloat)scale
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _dataInteractionImage = [[getUIImageClass() alloc] initWithCGImage:image scale:scale orientation:UIImageOrientationDownMirrored];
+
+ return self;
+}
+
+- (void)dealloc
+{
+ [_dataInteractionImage release];
+ [_textRectsInBoundingRectCoordinates release];
+ [_contentImageWithHighlight release];
+ [_contentImage release];
+
+ [super dealloc];
+}
+
+@end
+#endif // ENABLE(DATA_INTERACTION)
+
</ins><span class="cx"> @interface WebView (WebFileInternal)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (float)_deviceScaleFactor;
</span><span class="lines">@@ -1710,8 +1775,40 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(IOS)
</del><ins>+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(DATA_INTERACTION) && defined(__cplusplus)
+- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
+{
+ return _private->page->mainFrame().eventHandler().tryToBeginDataInteractionAtPoint(IntPoint(clientPosition), IntPoint(globalPosition));
+}
+
+- (void)_setDataInteractionData:(CGImageRef)image textIndicator:(std::optional<TextIndicatorData>)indicatorData atClientPosition:(CGPoint)clientPosition anchorPoint:(CGPoint)anchorPoint action:(uint64_t)action
+{
+ if (indicatorData)
+ _private->textIndicatorData = [[[WebUITextIndicatorData alloc] initWithImage:image TextIndicatorData:indicatorData.value() scale:_private->page->deviceScaleFactor()] retain];
+ else
+ _private->textIndicatorData = [[[WebUITextIndicatorData alloc] initWithImage:image scale:_private->page->deviceScaleFactor()] retain];
+}
+
+- (WebUITextIndicatorData *)_getDataInteractionData
+{
+ return _private->textIndicatorData;
+}
+#else
+- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
+{
+ return NO;
+}
+- (void)_setDataInteractionData:(CGImageRef)image textIndicator:(TextIndicatorData&)indicatorData atClientPosition:(CGPoint)clientPosition anchorPoint:(CGPoint)anchorPoint action:(uint64_t)action
+{
+}
+- (WebUITextIndicatorData *)_getDataInteractionData
+{
+ return nil;
+}
+#endif // ENABLE(DATA_INTERACTION) && defined(__cplusplus)
+
</ins><span class="cx"> static NSMutableSet *knownPluginMIMETypes()
</span><span class="cx"> {
</span><span class="cx"> static NSMutableSet *mimeTypes = [[NSMutableSet alloc] init];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@class UIImage;
+@class WebUITextIndicatorData;
</ins><span class="cx"> @class WebImmediateActionController;
</span><span class="cx"> @class WebInspector;
</span><span class="cx"> @class WebNodeHighlight;
</span><span class="lines">@@ -282,6 +284,7 @@
</span><span class="cx"> int32_t didDrawTiles;
</span><span class="cx"> WTF::Lock pendingFixedPositionLayoutRectMutex;
</span><span class="cx"> CGRect pendingFixedPositionLayoutRect;
</span><ins>+ WebUITextIndicatorData *textIndicatorData;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -212,6 +212,7 @@
</span><span class="cx"> [formDelegateForwarder release];
</span><span class="cx"> [_caretChangeListeners release];
</span><span class="cx"> [_fixedPositionContent release];
</span><ins>+ [textIndicatorData release];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [super dealloc];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import <WebCore/HTMLMediaElementEnums.h>
</span><span class="cx"> #import <WebCore/LayoutMilestones.h>
</span><span class="cx"> #import <WebCore/TextAlternativeWithRange.h>
</span><ins>+#import <WebCore/TextIndicator.h>
</ins><span class="cx"> #import <WebCore/TextIndicatorWindow.h>
</span><span class="cx"> #import <WebCore/WebCoreKeyboardUIMode.h>
</span><span class="cx"> #import <functional>
</span><span class="lines">@@ -89,6 +90,13 @@
</span><span class="cx"> OBJC_CLASS NSTextAlternatives;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(DATA_INTERACTION) && defined(__cplusplus)
+@interface WebUITextIndicatorData (WebUITextIndicatorInternal)
+- (WebUITextIndicatorData *)initWithImage:(CGImageRef)image textIndicatorData:(WebCore::TextIndicatorData&)indicatorData scale:(CGFloat)scale;
+- (WebUITextIndicatorData *)initWithImage:(CGImageRef)image scale:(CGFloat)scale;
+@end
+#endif
+
</ins><span class="cx"> @interface WebView (WebViewEditingExtras)
</span><span class="cx"> - (BOOL)_shouldChangeSelectedDOMRange:(DOMRange *)currentRange toDOMRange:(DOMRange *)proposedRange affinity:(NSSelectionAffinity)selectionAffinity stillSelecting:(BOOL)flag;
</span><span class="cx"> @end
</span><span class="lines">@@ -248,6 +256,10 @@
</span><span class="cx"> - (BOOL)_fetchCustomFixedPositionLayoutRect:(NSRect*)rect;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(DATA_INTERACTION) && defined(__cplusplus)
+- (void)_setDataInteractionData:(CGImageRef)image textIndicator:(std::optional<WebCore::TextIndicatorData>)textIndicator atClientPosition:(CGPoint)clientPosition anchorPoint:(CGPoint)anchorPoint action:(uint64_t)action;
+#endif
+
</ins><span class="cx"> - (void)_preferencesChanged:(WebPreferences *)preferences;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && defined(__cplusplus)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+@class UIImage;
</ins><span class="cx"> @class NSError;
</span><span class="cx"> @class WebFrame;
</span><span class="cx"> @class WebDeviceOrientation;
</span><span class="lines">@@ -180,6 +181,17 @@
</span><span class="cx"> WebNotificationPermissionDenied
</span><span class="cx"> } WebNotificationPermission;
</span><span class="cx">
</span><ins>+@interface WebUITextIndicatorData : NSObject
+@property (nonatomic, retain) UIImage *dataInteractionImage;
+@property (nonatomic, assign) CGRect selectionRectInRootViewCoordinates;
+@property (nonatomic, assign) CGRect textBoundingRectInRootViewCoordinates;
+@property (nonatomic, retain) NSArray<NSValue *> *textRectsInBoundingRectCoordinates; // CGRect values
+@property (nonatomic, assign) CGFloat contentImageScaleFactor;
+@property (nonatomic, retain) UIImage *contentImageWithHighlight;
+@property (nonatomic, retain) UIImage *contentImage;
+
+@end
+
</ins><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> @interface WebController : NSTreeController {
</span><span class="cx"> IBOutlet WebView *webView;
</span><span class="lines">@@ -449,8 +461,11 @@
</span><span class="cx"> + (void)_releaseMemoryNow;
</span><span class="cx">
</span><span class="cx"> - (void)_replaceCurrentHistoryItem:(WebHistoryItem *)item;
</span><del>-#endif // PLATFORM(IOS)
</del><ins>+#endif // TARGET_OS_IPHONE
</ins><span class="cx">
</span><ins>+- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition;
+- (WebUITextIndicatorData *)_getDataInteractionData;
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> // Deprecated. Use -[WebDataSource _quickLookContent] instead.
</span><span class="cx"> - (NSDictionary *)quickLookContentForURL:(NSURL *)url;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-01 Megan Gardner <megan_gardner@apple.com>
+
+ Data interaction support for WK1
+ https://bugs.webkit.org/show_bug.cgi?id=169062
+
+ Reviewed by Wenson Hsieh.
+
+ Allow for separate additions files in WK1 and WK2
+
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+
</ins><span class="cx"> 2017-03-02 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Activate ICE candidate privacy policy
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (213291 => 213292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-03-02 18:42:16 UTC (rev 213291)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-03-02 19:16:44 UTC (rev 213292)
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
-#import <WebKitAdditions/WebDragClientAdditions.mm>
</del><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditionsWebKit2.mm>)
+#import <WebKitAdditions/WebDragClientAdditionsWebKit2.mm>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>