Changeset 213308 in webkit

Timestamp:

Mar 2, 2017 2:50:55 PM (7 years ago)

Author:

Megan Gardner

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]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (2 diffs)
• WebView/WebViewData.h (modified) (1 diff)
• WebView/WebViewData.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -619 +619 @@
 
 #if ENABLE(DATA_INTERACTION)
+
 @implementation WebUITextIndicatorData
 
@@ -1787 +1788 @@
 {
     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];

trunk/Source/WebKit/mac/WebView/WebViewData.h

@@ -285 +285 @@
     WTF::Lock pendingFixedPositionLayoutRectMutex;
     CGRect pendingFixedPositionLayoutRect;
+#endif
+    
+#if ENABLE(DATA_INTERACTION)
     WebUITextIndicatorData *textIndicatorData;
 #endif
+
 
 #if !PLATFORM(IOS)

trunk/Source/WebKit/mac/WebView/WebViewData.mm

@@ -213 +213 @@
     [_caretChangeListeners release];
     [_fixedPositionContent release];
+#endif
+#if ENABLE(DATA_INTERACTION)
     [textIndicatorData release];
 #endif