WebKit fails to build (_startAssistingNode has conflicting parameters)
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Feb 2018 04:20:48 +0000 (04:20 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Feb 2018 04:20:48 +0000 (04:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182417
<rdar://problem/36965318>

Reviewed by Dan Bernstein.

* UIProcess/ios/WKContentViewInteraction.h:
Use Big BOOL like in the implementation.

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

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

index 4735529..212ea2d 100644 (file)
@@ -1,3 +1,14 @@
+2018-02-01  Tim Horton  <timothy_horton@apple.com>
+
+        WebKit fails to build (_startAssistingNode has conflicting parameters)
+        https://bugs.webkit.org/show_bug.cgi?id=182417
+        <rdar://problem/36965318>
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        Use Big BOOL like in the implementation.
+
 2018-02-01  Brent Fulgham  <bfulgham@apple.com>
 
         Improve NetworkResourceLogger to report blocked (versus non-partitioned) cookies
index cdfa61b..818143a 100644 (file)
@@ -291,7 +291,7 @@ FOR_EACH_WKCONTENTVIEW_ACTION(DECLARE_WKCONTENTVIEW_ACTION_FOR_WEB_VIEW)
 
 - (BOOL)_mayDisableDoubleTapGesturesDuringSingleTap;
 - (void)_disableDoubleTapGesturesDuringTapIfNecessary:(uint64_t)requestID;
-- (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode changingActivityState:(bool)changingActivityState userObject:(NSObject <NSSecureCoding> *)userObject;
+- (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode changingActivityState:(BOOL)changingActivityState userObject:(NSObject <NSSecureCoding> *)userObject;
 - (void)_stopAssistingNode;
 - (void)_selectionChanged;
 - (void)_updateChangedSelection;