Title: [213308] trunk/Source/WebKit/mac
- Revision
- 213308
- Author
- megan_gard...@apple.com
- Date
- 2017-03-02 14:50:55 -0800 (Thu, 02 Mar 2017)
Log Message
Data Interaction build fixes
https://bugs.webkit.org/show_bug.cgi?id=169096
Reviewed by Tim Horton.
Guards weren't all correct, also missed a selector name change.
* WebView/WebView.mm:
(-[WebView _setDataInteractionData:textIndicator:atClientPosition:anchorPoint:action:]):
* WebView/WebViewData.h:
* WebView/WebViewData.mm:
(-[WebViewPrivate dealloc]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (213307 => 213308)
--- trunk/Source/WebKit/mac/ChangeLog 2017-03-02 22:47:32 UTC (rev 213307)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-02 22:50:55 UTC (rev 213308)
@@ -1,3 +1,18 @@
+2017-03-02 Megan Gardner <megan_gard...@apple.com>
+
+ Data Interaction build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=169096
+
+ Reviewed by Tim Horton.
+
+ Guards weren't all correct, also missed a selector name change.
+
+ * WebView/WebView.mm:
+ (-[WebView _setDataInteractionData:textIndicator:atClientPosition:anchorPoint:action:]):
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate dealloc]):
+
2017-03-02 Alex Christensen <achristen...@webkit.org>
Continue enabling WebRTC
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (213307 => 213308)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-02 22:47:32 UTC (rev 213307)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-02 22:50:55 UTC (rev 213308)
@@ -618,6 +618,7 @@
} // namespace WebKit
#if ENABLE(DATA_INTERACTION)
+
@implementation WebUITextIndicatorData
@synthesize dataInteractionImage=_dataInteractionImage;
@@ -1786,7 +1787,7 @@
- (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];
+ _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];
}
Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (213307 => 213308)
--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2017-03-02 22:47:32 UTC (rev 213307)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2017-03-02 22:50:55 UTC (rev 213308)
@@ -284,9 +284,13 @@
int32_t didDrawTiles;
WTF::Lock pendingFixedPositionLayoutRectMutex;
CGRect pendingFixedPositionLayoutRect;
+#endif
+
+#if ENABLE(DATA_INTERACTION)
WebUITextIndicatorData *textIndicatorData;
#endif
+
#if !PLATFORM(IOS)
// WebKit has both a global plug-in database and a separate, per WebView plug-in database. Dashboard uses the per WebView database.
WebPluginDatabase *pluginDatabase;
Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (213307 => 213308)
--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2017-03-02 22:47:32 UTC (rev 213307)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2017-03-02 22:50:55 UTC (rev 213308)
@@ -212,6 +212,8 @@
[formDelegateForwarder release];
[_caretChangeListeners release];
[_fixedPositionContent release];
+#endif
+#if ENABLE(DATA_INTERACTION)
[textIndicatorData release];
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
