<!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>[282822] trunk/Source/WebCore</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/282822">282822</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2021-09-21 09:37:43 -0700 (Tue, 21 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] Disable default system gesture on extended gamepad
https://bugs.webkit.org/show_bug.cgi?id=230297
<rdar://65610651>

Reviewed by Brady Eidson.

Prevent default system behavior for some game pad gestures.
Not testable on bots.

* platform/gamepad/cocoa/GameControllerGamepad.mm:
(WebCore::GameControllerGamepad::setupAsExtendedGamepad):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadmm">trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282821 => 282822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-21 16:06:01 UTC (rev 282821)
+++ trunk/Source/WebCore/ChangeLog      2021-09-21 16:37:43 UTC (rev 282822)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-09-21  Youenn Fablet  <youenn@apple.com>
+
+        [iOS] Disable default system gesture on extended gamepad
+        https://bugs.webkit.org/show_bug.cgi?id=230297
+        <rdar://65610651>
+
+        Reviewed by Brady Eidson.
+
+        Prevent default system behavior for some game pad gestures.
+        Not testable on bots.
+
+        * platform/gamepad/cocoa/GameControllerGamepad.mm:
+        (WebCore::GameControllerGamepad::setupAsExtendedGamepad):
+
</ins><span class="cx"> 2021-09-21  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove unused CGWindowCaptureSource
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm (282821 => 282822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm     2021-09-21 16:06:01 UTC (rev 282821)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm        2021-09-21 16:37:43 UTC (rev 282822)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> #import "GameControllerGamepadProvider.h"
</span><span class="cx"> #import "GamepadConstants.h"
</span><ins>+#import <GameController/GCControllerElement.h>
</ins><span class="cx"> #import <GameController/GameController.h>
</span><span class="cx"> 
</span><span class="cx"> #import "GameControllerSoftLink.h"
</span><span class="lines">@@ -70,6 +71,16 @@
</span><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static void disableDefaultSystemAction(GCControllerButtonInput *button)
+{
+#if PLATFORM(IOS_FAMILY)
+    if ([button respondsToSelector:@selector(preferredSystemGestureState)])
+        button.preferredSystemGestureState = GCSystemGestureStateDisabled;
+#else
+    UNUSED_PARAM(button);
+#endif
+}
+
</ins><span class="cx"> void GameControllerGamepad::setupAsExtendedGamepad()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_extendedGamepad);
</span><span class="lines">@@ -113,13 +124,17 @@
</span><span class="cx">     bindButton(m_extendedGamepad.get().dpad.left, GamepadButtonRole::LeftClusterLeft);
</span><span class="cx">     bindButton(m_extendedGamepad.get().dpad.right, GamepadButtonRole::LeftClusterRight);
</span><span class="cx"> 
</span><del>-    if (homeButton)
</del><ins>+    if (homeButton) {
</ins><span class="cx">         bindButton(homeButton, GamepadButtonRole::CenterClusterCenter);
</span><ins>+        disableDefaultSystemAction(homeButton);
+    }
</ins><span class="cx"> 
</span><span class="cx">     // Select, Start
</span><span class="cx"> #if HAVE(GCEXTENDEDGAMEPAD_BUTTONS_OPTIONS_MENU)
</span><span class="cx">     bindButton(m_extendedGamepad.get().buttonOptions, GamepadButtonRole::CenterClusterLeft);
</span><ins>+    disableDefaultSystemAction(m_extendedGamepad.get().buttonOptions);
</ins><span class="cx">     bindButton(m_extendedGamepad.get().buttonMenu, GamepadButtonRole::CenterClusterRight);
</span><ins>+    disableDefaultSystemAction(m_extendedGamepad.get().buttonMenu);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // L3, R3
</span></span></pre>
</div>
</div>

</body>
</html>