Data Interaction build fixes
authormegan_gardner@apple.com <megan_gardner@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Mar 2017 22:50:55 +0000 (22:50 +0000)
committermegan_gardner@apple.com <megan_gardner@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Mar 2017 22:50:55 +0000 (22:50 +0000)
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]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@213308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewData.h
Source/WebKit/mac/WebView/WebViewData.mm

index c559658..4ed67ac 100644 (file)
@@ -1,3 +1,18 @@
+2017-03-02  Megan Gardner  <megan_gardner@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  <achristensen@webkit.org>
 
         Continue enabling WebRTC
index 71ee6be..84fb512 100644 (file)
@@ -618,6 +618,7 @@ private:
 } // namespace WebKit
 
 #if ENABLE(DATA_INTERACTION)
+
 @implementation WebUITextIndicatorData
 
 @synthesize dataInteractionImage=_dataInteractionImage;
@@ -1786,7 +1787,7 @@ static void WebKitInitializeGamepadProviderIfNecessary()
 - (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];
 }
index ca4ecaa..b1bc78e 100644 (file)
@@ -284,9 +284,13 @@ private:
     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;
index 9db51a7..b374cb3 100644 (file)
@@ -212,6 +212,8 @@ WebViewLayerFlushScheduler::WebViewLayerFlushScheduler(LayerFlushController* flu
     [formDelegateForwarder release];
     [_caretChangeListeners release];
     [_fixedPositionContent release];
+#endif
+#if ENABLE(DATA_INTERACTION)
     [textIndicatorData release];
 #endif