<!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>[170553] 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/170553">170553</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-06-27 14:11:24 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>The user pressing a button on a gamepad should cause gamepads to become visible to all NavigatorGamepads.
https://bugs.webkit.org/show_bug.cgi?id=134375
Reviewed by Darin Adler.
No new tests (Not yet a tested config)
* Modules/gamepad/GamepadManager.cpp:
(WebCore::GamepadManager::platformGamepadConnected): Also call to makeGamepadsVisibileToBlindNavigators.
(WebCore::GamepadManager::platformGamepadDisconnected):
(WebCore::GamepadManager::platformGamepadInputActivity): Call makeGamepadsVisibileToBlindNavigators.
(WebCore::GamepadManager::makeGamepadsVisibileToBlindNavigators): Walk through each blind navigator
notifying it of each connected Gamepad.
(WebCore::GamepadManager::registerNavigator): Also add to the blind navigator set.
(WebCore::GamepadManager::unregisterNavigator): Also remove from the blind navigator set.
* Modules/gamepad/GamepadManager.h:
* platform/GamepadProviderClient.h: Added platformGamepadInputActivity.
* platform/mac/HIDGamepadProvider.cpp:
(WebCore::HIDGamepadProvider::HIDGamepadProvider):
(WebCore::HIDGamepadProvider::valuesChanged): Set the input notification timer which will notify the clients
that a button was pressed.
(WebCore::HIDGamepadProvider::inputNotificationTimerFired): Perform that notification.
* platform/mac/HIDGamepadProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagercpp">trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagerh">trunk/Source/WebCore/Modules/gamepad/GamepadManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformGamepadProviderClienth">trunk/Source/WebCore/platform/GamepadProviderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProvidercpp">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProviderh">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170552 => 170553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-27 21:04:16 UTC (rev 170552)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 21:11:24 UTC (rev 170553)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-06-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ The user pressing a button on a gamepad should cause gamepads to become visible to all NavigatorGamepads.
+ https://bugs.webkit.org/show_bug.cgi?id=134375
+
+ Reviewed by Darin Adler.
+
+ No new tests (Not yet a tested config)
+
+ * Modules/gamepad/GamepadManager.cpp:
+ (WebCore::GamepadManager::platformGamepadConnected): Also call to makeGamepadsVisibileToBlindNavigators.
+ (WebCore::GamepadManager::platformGamepadDisconnected):
+ (WebCore::GamepadManager::platformGamepadInputActivity): Call makeGamepadsVisibileToBlindNavigators.
+ (WebCore::GamepadManager::makeGamepadsVisibileToBlindNavigators): Walk through each blind navigator
+ notifying it of each connected Gamepad.
+ (WebCore::GamepadManager::registerNavigator): Also add to the blind navigator set.
+ (WebCore::GamepadManager::unregisterNavigator): Also remove from the blind navigator set.
+ * Modules/gamepad/GamepadManager.h:
+
+ * platform/GamepadProviderClient.h: Added platformGamepadInputActivity.
+
+ * platform/mac/HIDGamepadProvider.cpp:
+ (WebCore::HIDGamepadProvider::HIDGamepadProvider):
+ (WebCore::HIDGamepadProvider::valuesChanged): Set the input notification timer which will notify the clients
+ that a button was pressed.
+ (WebCore::HIDGamepadProvider::inputNotificationTimerFired): Perform that notification.
+ * platform/mac/HIDGamepadProvider.h:
+
+2014-06-27 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> HIDGamepads should populate themselves with initial input values
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134381
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp (170552 => 170553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-06-27 21:04:16 UTC (rev 170552)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-06-27 21:11:24 UTC (rev 170553)
</span><span class="lines">@@ -48,26 +48,54 @@
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadConnected(unsigned index)
</span><span class="cx"> {
</span><del>- for (auto& navigator : m_navigators)
- navigator->gamepadConnected(index);
</del><ins>+ for (auto& navigator : m_navigators) {
+ if (!m_gamepadBlindNavigators.contains(navigator))
+ navigator->gamepadConnected(index);
</ins><span class="cx">
</span><del>- // FIXME: Fire connected event to all pages with listeners.
</del><ins>+ // FIXME: Fire connected event to all pages with listeners.
+ }
+
+ makeGamepadsVisibileToBlindNavigators();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadDisconnected(unsigned index)
</span><span class="cx"> {
</span><del>- // FIXME: Fire disconnected event to all pages with listeners.
</del><ins>+ for (auto& navigator : m_navigators) {
+ if (!m_gamepadBlindNavigators.contains(navigator))
+ navigator->gamepadDisconnected(index);
</ins><span class="cx">
</span><del>- for (auto& navigator : m_navigators)
- navigator->gamepadDisconnected(index);
</del><ins>+ // FIXME: Fire disconnected event to all pages with listeners.
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void GamepadManager::platformGamepadInputActivity()
+{
+ makeGamepadsVisibileToBlindNavigators();
+}
+
+void GamepadManager::makeGamepadsVisibileToBlindNavigators()
+{
+ for (auto& navigator : m_gamepadBlindNavigators) {
+ // FIXME: Here we notify a blind Navigator of each existing gamepad.
+ // But we also need to fire the connected event to its corresponding DOMWindow objects.
+ auto& platformGamepads = GamepadProvider::shared().platformGamepads();
+ unsigned size = platformGamepads.size();
+ for (unsigned i = 0; i < size; ++i) {
+ if (platformGamepads[i])
+ navigator->gamepadConnected(i);
+ }
+ }
+
+ m_gamepadBlindNavigators.clear();
+}
+
</ins><span class="cx"> void GamepadManager::registerNavigator(NavigatorGamepad* navigator)
</span><span class="cx"> {
</span><span class="cx"> LOG(Gamepad, "GamepadManager registering NavigatorGamepad %p", navigator);
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_navigators.contains(navigator));
</span><span class="cx"> m_navigators.add(navigator);
</span><ins>+ m_gamepadBlindNavigators.add(navigator);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Monitoring gamepads will also be reliant on whether or not there are any
</span><span class="cx"> // connected/disconnected event listeners.
</span><span class="lines">@@ -84,6 +112,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_navigators.contains(navigator));
</span><span class="cx"> m_navigators.remove(navigator);
</span><ins>+ m_gamepadBlindNavigators.remove(navigator);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Monitoring gamepads will also be reliant on whether or not there are any
</span><span class="cx"> // connected/disconnected event listeners.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.h (170552 => 170553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2014-06-27 21:04:16 UTC (rev 170552)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2014-06-27 21:11:24 UTC (rev 170553)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void platformGamepadConnected(unsigned index) override final;
</span><span class="cx"> virtual void platformGamepadDisconnected(unsigned index) override final;
</span><ins>+ virtual void platformGamepadInputActivity() override final;
</ins><span class="cx">
</span><span class="cx"> void registerNavigator(NavigatorGamepad*);
</span><span class="cx"> void unregisterNavigator(NavigatorGamepad*);
</span><span class="lines">@@ -53,7 +54,10 @@
</span><span class="cx"> private:
</span><span class="cx"> GamepadManager();
</span><span class="cx">
</span><ins>+ void makeGamepadsVisibileToBlindNavigators();
+
</ins><span class="cx"> HashSet<NavigatorGamepad*> m_navigators;
</span><ins>+ HashSet<NavigatorGamepad*> m_gamepadBlindNavigators;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformGamepadProviderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GamepadProviderClient.h (170552 => 170553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GamepadProviderClient.h 2014-06-27 21:04:16 UTC (rev 170552)
+++ trunk/Source/WebCore/platform/GamepadProviderClient.h 2014-06-27 21:11:24 UTC (rev 170553)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void platformGamepadConnected(unsigned index) = 0;
</span><span class="cx"> virtual void platformGamepadDisconnected(unsigned index) = 0;
</span><ins>+ virtual void platformGamepadInputActivity() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp (170552 => 170553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp 2014-06-27 21:04:16 UTC (rev 170552)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp 2014-06-27 21:11:24 UTC (rev 170553)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static const double ConnectionDelayInterval = 0.5;
</span><ins>+static const double InputNotificationDelay = 0.05;
</ins><span class="cx">
</span><span class="cx"> static RetainPtr<CFDictionaryRef> deviceMatchingDictionary(uint32_t usagePage, uint32_t usage)
</span><span class="cx"> {
</span><span class="lines">@@ -81,6 +82,7 @@
</span><span class="cx"> HIDGamepadProvider::HIDGamepadProvider()
</span><span class="cx"> : m_shouldDispatchCallbacks(false)
</span><span class="cx"> , m_connectionDelayTimer(this, &HIDGamepadProvider::connectionDelayTimerFired)
</span><ins>+ , m_inputNotificationTimer(this, &HIDGamepadProvider::inputNotificationTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> m_manager = adoptCF(IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone));
</span><span class="cx">
</span><span class="lines">@@ -219,8 +221,22 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> gamepad->valueChanged(value);
</span><ins>+
+ // This isActive check is necessary as we want to delay input notifications from the time of the first input,
+ // and not push the notification out on every subsequent input.
+ if (!m_inputNotificationTimer.isActive())
+ m_inputNotificationTimer.startOneShot(InputNotificationDelay);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HIDGamepadProvider::inputNotificationTimerFired(Timer<HIDGamepadProvider>&)
+{
+ if (!m_shouldDispatchCallbacks)
+ return;
+
+ for (auto& client : m_clients)
+ client->platformGamepadInputActivity();
+}
+
</ins><span class="cx"> std::pair<std::unique_ptr<HIDGamepad>, unsigned> HIDGamepadProvider::removeGamepadForDevice(IOHIDDeviceRef device)
</span><span class="cx"> {
</span><span class="cx"> std::pair<std::unique_ptr<HIDGamepad>, unsigned> result;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h (170552 => 170553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h 2014-06-27 21:04:16 UTC (rev 170552)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h 2014-06-27 21:11:24 UTC (rev 170553)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> void closeAndUnscheduleManager();
</span><span class="cx">
</span><span class="cx"> void connectionDelayTimerFired(Timer<HIDGamepadProvider>&);
</span><ins>+ void inputNotificationTimerFired(Timer<HIDGamepadProvider>&);
</ins><span class="cx">
</span><span class="cx"> unsigned indexForNewlyConnectedDevice();
</span><span class="cx">
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> bool m_shouldDispatchCallbacks;
</span><span class="cx">
</span><span class="cx"> Timer<HIDGamepadProvider> m_connectionDelayTimer;
</span><ins>+ Timer<HIDGamepadProvider> m_inputNotificationTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>