<!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>[170957] 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/170957">170957</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 23:08:58 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fire connected/disconnected events for Gamepads.
https://bugs.webkit.org/show_bug.cgi?id=134386
Reviewed by Dean Jackson.
No new tests (No effect in a currently tested config)
* Modules/gamepad/GamepadManager.cpp:
(WebCore::navigatorGamepadFromDOMWindow): Handling converting a possibly-null Navigator into
a possibly null NavigatorGamepad.
(WebCore::GamepadManager::platformGamepadConnected): Notify blind Navigator/DOMWindows of all
previously attached Gamepads, then notify everybody of this new gamepad.
(WebCore::GamepadManager::platformGamepadDisconnected): Handle dispatching the disconnected
event to all registered DOMWindows.
(WebCore::GamepadManager::platformGamepadInputActivity): Notify blind Navigator/DOMWindows of all
attached Gamepads.
(WebCore::GamepadManager::makeGamepadVisible): Handles notifying setting up a new gamepads
with all NavigatorGamepads as well as dispatching the connected even to DOMWindows.
(WebCore::GamepadManager::registerDOMWindow):
(WebCore::GamepadManager::unregisterDOMWindow):
(WebCore::GamepadManager::makeGamepadsVisibileToBlindNavigators): Deleted.
* Modules/gamepad/GamepadManager.h:
* Modules/gamepad/NavigatorGamepad.cpp:
(WebCore::NavigatorGamepad::gamepadAtIndex):
* Modules/gamepad/NavigatorGamepad.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="#trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadh">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170956 => 170957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-10 05:59:04 UTC (rev 170956)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 06:08:58 UTC (rev 170957)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-07-09 Brady Eidson <beidson@apple.com>
+
+ Fire connected/disconnected events for Gamepads.
+ https://bugs.webkit.org/show_bug.cgi?id=134386
+
+ Reviewed by Dean Jackson.
+
+ No new tests (No effect in a currently tested config)
+
+ * Modules/gamepad/GamepadManager.cpp:
+ (WebCore::navigatorGamepadFromDOMWindow): Handling converting a possibly-null Navigator into
+ a possibly null NavigatorGamepad.
+ (WebCore::GamepadManager::platformGamepadConnected): Notify blind Navigator/DOMWindows of all
+ previously attached Gamepads, then notify everybody of this new gamepad.
+ (WebCore::GamepadManager::platformGamepadDisconnected): Handle dispatching the disconnected
+ event to all registered DOMWindows.
+ (WebCore::GamepadManager::platformGamepadInputActivity): Notify blind Navigator/DOMWindows of all
+ attached Gamepads.
+ (WebCore::GamepadManager::makeGamepadVisible): Handles notifying setting up a new gamepads
+ with all NavigatorGamepads as well as dispatching the connected even to DOMWindows.
+ (WebCore::GamepadManager::registerDOMWindow):
+ (WebCore::GamepadManager::unregisterDOMWindow):
+ (WebCore::GamepadManager::makeGamepadsVisibileToBlindNavigators): Deleted.
+ * Modules/gamepad/GamepadManager.h:
+
+ * Modules/gamepad/NavigatorGamepad.cpp:
+ (WebCore::NavigatorGamepad::gamepadAtIndex):
+ * Modules/gamepad/NavigatorGamepad.h:
+
</ins><span class="cx"> 2014-07-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Disable text quantization while actively changing the page's scale factor
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp (170956 => 170957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-07-10 05:59:04 UTC (rev 170956)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-07-10 06:08:58 UTC (rev 170957)
</span><span class="lines">@@ -27,7 +27,10 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx">
</span><ins>+#include "DOMWindow.h"
+#include "Document.h"
</ins><span class="cx"> #include "Gamepad.h"
</span><ins>+#include "GamepadEvent.h"
</ins><span class="cx"> #include "GamepadProvider.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NavigatorGamepad.h"
</span><span class="lines">@@ -35,6 +38,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static NavigatorGamepad* navigatorGamepadFromDOMWindow(DOMWindow* window)
+{
+ Navigator* navigator = window->navigator();
+ if (!navigator)
+ return nullptr;
+
+ return NavigatorGamepad::from(navigator);
+}
+
</ins><span class="cx"> GamepadManager& GamepadManager::shared()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<GamepadManager> sharedManager;
</span><span class="lines">@@ -48,43 +60,95 @@
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadConnected(PlatformGamepad& platformGamepad)
</span><span class="cx"> {
</span><del>- for (auto& navigator : m_navigators) {
- if (!m_gamepadBlindNavigators.contains(navigator))
- navigator->gamepadConnected(platformGamepad);
</del><ins>+ // Notify blind Navigators and Windows about all gamepads except for this one.
+ for (auto* gamepad : GamepadProvider::shared().platformGamepads()) {
+ if (!gamepad || gamepad == &platformGamepad)
+ continue;
</ins><span class="cx">
</span><del>- // FIXME: Fire connected event to all pages with listeners.
</del><ins>+ makeGamepadVisible(*gamepad, m_gamepadBlindNavigators, m_gamepadBlindDOMWindows);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- makeGamepadsVisibileToBlindNavigators();
</del><ins>+ m_gamepadBlindNavigators.clear();
+ m_gamepadBlindDOMWindows.clear();
+
+ // Notify everyone of this new gamepad.
+ makeGamepadVisible(platformGamepad, m_navigators, m_domWindows);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadDisconnected(PlatformGamepad& platformGamepad)
</span><span class="cx"> {
</span><del>- for (auto& navigator : m_navigators) {
- if (!m_gamepadBlindNavigators.contains(navigator))
- navigator->gamepadDisconnected(platformGamepad);
</del><ins>+ Vector<DOMWindow*> domWindowVector;
+ copyToVector(m_domWindows, domWindowVector);
</ins><span class="cx">
</span><del>- // FIXME: Fire disconnected event to all pages with listeners.
</del><ins>+ HashSet<NavigatorGamepad*> notifiedNavigators;
+
+ // Handle the disconnect for all DOMWindows with event listeners and their Navigators.
+ for (auto* window : domWindowVector) {
+ // Event dispatch might have made this window go away.
+ if (!m_domWindows.contains(window))
+ continue;
+
+ NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window);
+ if (!navigator)
+ continue;
+
+ // If this Navigator hasn't seen gamepads yet then its Window should not get the disconnect event.
+ if (m_gamepadBlindNavigators.contains(navigator))
+ continue;
+
+ RefPtr<Gamepad> gamepad = navigator->gamepadAtIndex(platformGamepad.index());
+ ASSERT(gamepad);
+
+ navigator->gamepadDisconnected(platformGamepad);
+ notifiedNavigators.add(navigator);
+
+ window->dispatchEvent(GamepadEvent::create(eventNames().gamepaddisconnectedEvent, gamepad.get()), window->document());
</ins><span class="cx"> }
</span><ins>+
+ // Notify all the Navigators that haven't already been notified.
+ for (auto* navigator : m_navigators) {
+ if (!notifiedNavigators.contains(navigator))
+ navigator->gamepadDisconnected(platformGamepad);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadInputActivity()
</span><span class="cx"> {
</span><del>- makeGamepadsVisibileToBlindNavigators();
</del><ins>+ if (m_gamepadBlindNavigators.isEmpty() && m_gamepadBlindDOMWindows.isEmpty())
+ return;
+
+ for (auto* gamepad : GamepadProvider::shared().platformGamepads())
+ makeGamepadVisible(*gamepad, m_gamepadBlindNavigators, m_gamepadBlindDOMWindows);
+
+ m_gamepadBlindNavigators.clear();
+ m_gamepadBlindDOMWindows.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GamepadManager::makeGamepadsVisibileToBlindNavigators()
</del><ins>+void GamepadManager::makeGamepadVisible(PlatformGamepad& platformGamepad, HashSet<NavigatorGamepad*>& navigatorSet, HashSet<DOMWindow*>& domWindowSet)
</ins><span class="cx"> {
</span><del>- 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.
- for (auto& platformGamepad : GamepadProvider::shared().platformGamepads()) {
- if (platformGamepad)
- navigator->gamepadConnected(*platformGamepad);
- }
</del><ins>+ if (navigatorSet.isEmpty() && domWindowSet.isEmpty())
+ return;
+
+ for (auto* navigator : navigatorSet)
+ navigator->gamepadConnected(platformGamepad);
+
+ Vector<DOMWindow*> domWindowVector;
+ copyToVector(domWindowSet, domWindowVector);
+
+ for (auto* window : domWindowVector) {
+ // Event dispatch might have made this window go away.
+ if (!m_domWindows.contains(window))
+ continue;
+
+ NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window);
+ if (!navigator)
+ continue;
+
+ RefPtr<Gamepad> gamepad = navigator->gamepadAtIndex(platformGamepad.index());
+ ASSERT(gamepad);
+
+ window->dispatchEvent(GamepadEvent::create(eventNames().gamepadconnectedEvent, gamepad.get()), window->document());
</ins><span class="cx"> }
</span><del>-
- m_gamepadBlindNavigators.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GamepadManager::registerNavigator(NavigatorGamepad* navigator)
</span><span class="lines">@@ -116,6 +180,18 @@
</span><span class="cx"> ASSERT(!m_domWindows.contains(window));
</span><span class="cx"> m_domWindows.add(window);
</span><span class="cx">
</span><ins>+ // Anytime we register a DOMWindow, we should also double check that its NavigatorGamepad is registered.
+ NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window);
+ ASSERT(navigator);
+
+ if (m_navigators.add(navigator).isNewEntry)
+ m_gamepadBlindNavigators.add(navigator);
+
+ // If this DOMWindow's NavigatorGamepad was already registered but was still blind,
+ // then this DOMWindow should be blind.
+ if (m_gamepadBlindNavigators.contains(navigator))
+ m_gamepadBlindDOMWindows.add(window);
+
</ins><span class="cx"> maybeStartMonitoringGamepads();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,6 +201,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_domWindows.contains(window));
</span><span class="cx"> m_domWindows.remove(window);
</span><ins>+ m_gamepadBlindDOMWindows.remove(window);
</ins><span class="cx">
</span><span class="cx"> maybeStopMonitoringGamepads();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.h (170956 => 170957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2014-07-10 05:59:04 UTC (rev 170956)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2014-07-10 06:08:58 UTC (rev 170957)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/text/AtomicString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -57,7 +58,8 @@
</span><span class="cx"> private:
</span><span class="cx"> GamepadManager();
</span><span class="cx">
</span><del>- void makeGamepadsVisibileToBlindNavigators();
</del><ins>+ void makeGamepadVisible(PlatformGamepad&, HashSet<NavigatorGamepad*>&, HashSet<DOMWindow*>&);
+ void dispatchGamepadEvent(const WTF::AtomicString& eventName, PlatformGamepad&);
</ins><span class="cx">
</span><span class="cx"> void maybeStartMonitoringGamepads();
</span><span class="cx"> void maybeStopMonitoringGamepads();
</span><span class="lines">@@ -67,6 +69,7 @@
</span><span class="cx"> HashSet<NavigatorGamepad*> m_navigators;
</span><span class="cx"> HashSet<NavigatorGamepad*> m_gamepadBlindNavigators;
</span><span class="cx"> HashSet<DOMWindow*> m_domWindows;
</span><ins>+ HashSet<DOMWindow*> m_gamepadBlindDOMWindows;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (170956 => 170957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2014-07-10 05:59:04 UTC (rev 170956)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2014-07-10 06:08:58 UTC (rev 170957)
</span><span class="lines">@@ -72,6 +72,13 @@
</span><span class="cx"> return supplement;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Gamepad* NavigatorGamepad::gamepadAtIndex(unsigned index)
+{
+ if (index >= m_gamepads.size())
+ return nullptr;
+ return m_gamepads[index].get();
+}
+
</ins><span class="cx"> const Vector<RefPtr<Gamepad>>& NavigatorGamepad::getGamepads(Navigator* navigator)
</span><span class="cx"> {
</span><span class="cx"> return NavigatorGamepad::from(navigator)->gamepads();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h (170956 => 170957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h 2014-07-10 05:59:04 UTC (rev 170956)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h 2014-07-10 06:08:58 UTC (rev 170957)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> void gamepadConnected(PlatformGamepad&);
</span><span class="cx"> void gamepadDisconnected(PlatformGamepad&);
</span><span class="cx">
</span><ins>+ Gamepad* gamepadAtIndex(unsigned index);
+
</ins><span class="cx"> private:
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>