<!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>[281210] 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/281210">281210</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2021-08-18 14:17:26 -0700 (Wed, 18 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove unneeded UIKitSPI declarations
https://bugs.webkit.org/show_bug.cgi?id=210075

Reviewed by Wenson Hsieh.

Source/WebKit:

No code changes, just using the now fully public API.

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _webTouchEventsRecognized:]):
(-[WKContentView _highlightLongPressRecognized:]):
(-[WKContentView _doubleTapRecognizedForDoubleClick:]):
(-[WKContentView _twoFingerSingleTapGestureRecognized:]):
(-[WKContentView _singleTapRecognized:]):
(gestureRecognizerModifierFlags): Deleted.

Source/WTF:

Remove unneeded feature define.

* wtf/PlatformHave.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformHaveh">trunk/Source/WTF/wtf/PlatformHave.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosUIKitSPIh">trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (281209 => 281210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WTF/ChangeLog  2021-08-18 21:17:26 UTC (rev 281210)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-08-18  Megan Gardner  <megan_gardner@apple.com>
+
+        Remove unneeded UIKitSPI declarations
+        https://bugs.webkit.org/show_bug.cgi?id=210075
+
+        Reviewed by Wenson Hsieh.
+
+        Remove unneeded feature define.
+
+        * wtf/PlatformHave.h:
+
</ins><span class="cx"> 2021-08-18  Xabier Rodriguez Calvar  <calvaris@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GStreamer][EME] Try to parse XML init datas that could possibly come from MPD manifests
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformHaveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformHave.h (281209 => 281210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformHave.h      2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-08-18 21:17:26 UTC (rev 281210)
</span><span class="lines">@@ -501,10 +501,6 @@
</span><span class="cx"> #define HAVE_UI_POINTER_INTERACTION 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
-#define HAVE_UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS 1
-#endif
-
</del><span class="cx"> #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400) || PLATFORM(MACCATALYST)
</span><span class="cx"> #define HAVE_UIKIT_WITH_MOUSE_SUPPORT 1
</span><span class="cx"> #define HAVE_UI_PARALLAX_TRANSITION_GESTURE_RECOGNIZER 1
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281209 => 281210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WebKit/ChangeLog       2021-08-18 21:17:26 UTC (rev 281210)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-08-18  Megan Gardner  <megan_gardner@apple.com>
+
+        Remove unneeded UIKitSPI declarations
+        https://bugs.webkit.org/show_bug.cgi?id=210075
+
+        Reviewed by Wenson Hsieh.
+
+        No code changes, just using the now fully public API.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _webTouchEventsRecognized:]):
+        (-[WKContentView _highlightLongPressRecognized:]):
+        (-[WKContentView _doubleTapRecognizedForDoubleClick:]):
+        (-[WKContentView _twoFingerSingleTapGestureRecognized:]):
+        (-[WKContentView _singleTapRecognized:]):
+        (gestureRecognizerModifierFlags): Deleted.
+
</ins><span class="cx"> 2021-08-18  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [MacOS] Use com.apple.webkit.microphone extension to gate microphone access in GPUProcess sandbox
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (281209 => 281210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h  2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h     2021-08-18 21:17:26 UTC (rev 281210)
</span><span class="lines">@@ -456,12 +456,6 @@
</span><span class="cx"> - (CGSize)_legacy_sizeWithFont:(UIFont *)font minFontSize:(CGFloat)minFontSize actualFontSize:(CGFloat *)actualFontSize forWidth:(CGFloat)width lineBreakMode:(NSLineBreakMode)lineBreakMode;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@interface UIGestureRecognizer ()
-#if PLATFORM(IOS) && !defined(__IPHONE_13_4)
-@property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
-#endif
-@end
-
</del><span class="cx"> #if HAVE(UI_HOVER_EVENT_RESPONDABLE)
</span><span class="cx"> 
</span><span class="cx"> @protocol _UIHoverEventRespondable <NSObject>
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (281209 => 281210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2021-08-18 20:21:06 UTC (rev 281209)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2021-08-18 21:17:26 UTC (rev 281210)
</span><span class="lines">@@ -1676,15 +1676,6 @@
</span><span class="cx">     return std::nullopt;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline static UIKeyModifierFlags gestureRecognizerModifierFlags(UIGestureRecognizer *recognizer)
-{
-#if HAVE(UI_GESTURE_RECOGNIZER_MODIFIER_FLAGS)
-    return recognizer.modifierFlags;
-#else
-    return [recognizer respondsToSelector:@selector(_modifierFlags)] ? [recognizer _modifierFlags] : 0;
-#endif
-}
-
</del><span class="cx"> - (BOOL)_touchEventsMustRequireGestureRecognizerToFail:(UIGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><span class="cx">     auto webView = self.webView;
</span><span class="lines">@@ -1719,7 +1710,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>-    WebKit::NativeWebTouchEvent nativeWebTouchEvent { lastTouchEvent, gestureRecognizerModifierFlags(gestureRecognizer) };
</del><ins>+    WebKit::NativeWebTouchEvent nativeWebTouchEvent { lastTouchEvent, gestureRecognizer.modifierFlags };
</ins><span class="cx">     nativeWebTouchEvent.setCanPreventNativeGestures(_touchEventsCanPreventNativeGestures || [gestureRecognizer isDefaultPrevented]);
</span><span class="cx"> 
</span><span class="cx">     [self _handleTouchActionsForTouchEvent:nativeWebTouchEvent];
</span><span class="lines">@@ -3046,7 +3037,7 @@
</span><span class="cx">         break;
</span><span class="cx">     case UIGestureRecognizerStateEnded:
</span><span class="cx">         if (_longPressCanClick && _positionInformation.isElement) {
</span><del>-            [self _attemptSyntheticClickAtLocation:gestureRecognizer.startPoint modifierFlags:gestureRecognizerModifierFlags(gestureRecognizer)];
</del><ins>+            [self _attemptSyntheticClickAtLocation:gestureRecognizer.startPoint modifierFlags:gestureRecognizer.modifierFlags];
</ins><span class="cx">             [self _finishInteraction];
</span><span class="cx">         } else
</span><span class="cx">             [self _cancelInteraction];
</span><span class="lines">@@ -3063,7 +3054,7 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_doubleTapRecognizedForDoubleClick:(UITapGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><del>-    _page->handleDoubleTapForDoubleClickAtPoint(WebCore::IntPoint(gestureRecognizer.location), WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer)), _layerTreeTransactionIdAtLastInteractionStart);
</del><ins>+    _page->handleDoubleTapForDoubleClickAtPoint(WebCore::IntPoint(gestureRecognizer.location), WebKit::webEventModifierFlags(gestureRecognizer.modifierFlags), _layerTreeTransactionIdAtLastInteractionStart);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_twoFingerSingleTapGestureRecognized:(UITapGestureRecognizer *)gestureRecognizer
</span><span class="lines">@@ -3070,7 +3061,7 @@
</span><span class="cx"> {
</span><span class="cx">     _isTapHighlightIDValid = YES;
</span><span class="cx">     _isExpectingFastSingleTapCommit = YES;
</span><del>-    _page->handleTwoFingerTapAtPoint(WebCore::roundedIntPoint(gestureRecognizer.centroid), WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer) | UIKeyModifierCommand), ++_latestTapID);
</del><ins>+    _page->handleTwoFingerTapAtPoint(WebCore::roundedIntPoint(gestureRecognizer.centroid), WebKit::webEventModifierFlags(gestureRecognizer.modifierFlags | UIKeyModifierCommand), ++_latestTapID);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_longPressRecognized:(UILongPressGestureRecognizer *)gestureRecognizer
</span><span class="lines">@@ -3209,7 +3200,7 @@
</span><span class="cx">         pointerId = [singleTapTouchIdentifier unsignedIntValue];
</span><span class="cx">         m_commitPotentialTapPointerId = pointerId;
</span><span class="cx">     }
</span><del>-    _page->commitPotentialTap(WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer)), _layerTreeTransactionIdAtLastInteractionStart, pointerId);
</del><ins>+    _page->commitPotentialTap(WebKit::webEventModifierFlags(gestureRecognizer.modifierFlags), _layerTreeTransactionIdAtLastInteractionStart, pointerId);
</ins><span class="cx"> 
</span><span class="cx">     if (!_isExpectingFastSingleTapCommit)
</span><span class="cx">         [self _finishInteraction];
</span></span></pre>
</div>
</div>

</body>
</html>