<!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>[170911] 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/170911">170911</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-08 23:50:35 -0700 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DOMWindows should register themselves with the GamepadManager when they have event listeners
https://bugs.webkit.org/show_bug.cgi?id=134669
Reviewed by Dean Jackson.
No new tests (No effect in a currently tested config)
By having DOMWindows register with the GamepadManager when they have/don’t have gamepad event
listeners, we accomplish two things:
1 - It’s simple for GamepadManager to dispatch gamepad events directly to the DOMWindows interested.
2 - We know when to start monitoring for gamepad connections.
* Modules/gamepad/GamepadManager.cpp:
(WebCore::GamepadManager::GamepadManager):
(WebCore::GamepadManager::registerNavigator):
(WebCore::GamepadManager::unregisterNavigator):
(WebCore::GamepadManager::registerDOMWindow):
(WebCore::GamepadManager::unregisterDOMWindow):
(WebCore::GamepadManager::maybeStartMonitoringGamepads): Start monitoring gamepads if there are any
registered DOMWindows or NavigatorGamepads, and we aren’t already monitoring them.
(WebCore::GamepadManager::maybeStopMonitoringGamepads): Stop monitoring gamepads if there aren’t any
registered DOMWindows or NavigatorGameads, and we have been monitoring them before now.
* Modules/gamepad/GamepadManager.h:
* dom/EventNames.h:
(WebCore::EventNames::isGamepadEventType):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::DOMWindow):
(WebCore::DOMWindow::~DOMWindow): If registered for gamepad events, unregister now.
(WebCore::DOMWindow::incrementGamepadEventListenerCount): If this is the first gamepad event
listener, register with the GamepadManager now.
(WebCore::DOMWindow::decrementGamepadEventListenerCount): If this was the last gamepad event
listener, unregister from the GamepadManager now.
(WebCore::DOMWindow::addEventListener):
(WebCore::DOMWindow::removeEventListener):
* page/DOMWindow.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="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170910 => 170911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 05:56:45 UTC (rev 170910)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 06:50:35 UTC (rev 170911)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-07-08 Brady Eidson <beidson@apple.com>
+
+ DOMWindows should register themselves with the GamepadManager when they have event listeners
+ https://bugs.webkit.org/show_bug.cgi?id=134669
+
+ Reviewed by Dean Jackson.
+
+ No new tests (No effect in a currently tested config)
+
+ By having DOMWindows register with the GamepadManager when they have/don’t have gamepad event
+ listeners, we accomplish two things:
+ 1 - It’s simple for GamepadManager to dispatch gamepad events directly to the DOMWindows interested.
+ 2 - We know when to start monitoring for gamepad connections.
+
+ * Modules/gamepad/GamepadManager.cpp:
+ (WebCore::GamepadManager::GamepadManager):
+ (WebCore::GamepadManager::registerNavigator):
+ (WebCore::GamepadManager::unregisterNavigator):
+ (WebCore::GamepadManager::registerDOMWindow):
+ (WebCore::GamepadManager::unregisterDOMWindow):
+ (WebCore::GamepadManager::maybeStartMonitoringGamepads): Start monitoring gamepads if there are any
+ registered DOMWindows or NavigatorGamepads, and we aren’t already monitoring them.
+ (WebCore::GamepadManager::maybeStopMonitoringGamepads): Stop monitoring gamepads if there aren’t any
+ registered DOMWindows or NavigatorGameads, and we have been monitoring them before now.
+ * Modules/gamepad/GamepadManager.h:
+
+ * dom/EventNames.h:
+ (WebCore::EventNames::isGamepadEventType):
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::DOMWindow):
+ (WebCore::DOMWindow::~DOMWindow): If registered for gamepad events, unregister now.
+ (WebCore::DOMWindow::incrementGamepadEventListenerCount): If this is the first gamepad event
+ listener, register with the GamepadManager now.
+ (WebCore::DOMWindow::decrementGamepadEventListenerCount): If this was the last gamepad event
+ listener, unregister from the GamepadManager now.
+ (WebCore::DOMWindow::addEventListener):
+ (WebCore::DOMWindow::removeEventListener):
+ * page/DOMWindow.h:
+
</ins><span class="cx"> 2014-07-08 Sun-woo Nam <sunny.nam@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix the build break when ENABLE_ENCRYPTED_MEDIA_V2 is turned on.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp (170910 => 170911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-07-09 05:56:45 UTC (rev 170910)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-07-09 06:50:35 UTC (rev 170911)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GamepadManager::GamepadManager()
</span><ins>+ : m_isMonitoringGamepads(false)
</ins><span class="cx"> {
</span><del>- GamepadProvider::shared().stopMonitoringGamepads(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadConnected(PlatformGamepad& platformGamepad)
</span><span class="lines">@@ -95,13 +95,7 @@
</span><span class="cx"> m_navigators.add(navigator);
</span><span class="cx"> m_gamepadBlindNavigators.add(navigator);
</span><span class="cx">
</span><del>- // FIXME: Monitoring gamepads will also be reliant on whether or not there are any
- // connected/disconnected event listeners.
- // Those event listeners will also need to register with the GamepadManager.
- if (m_navigators.size() == 1) {
- LOG(Gamepad, "GamepadManager registered first navigator, is starting gamepad monitoring");
- GamepadProvider::shared().startMonitoringGamepads(this);
- }
</del><ins>+ maybeStartMonitoringGamepads();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GamepadManager::unregisterNavigator(NavigatorGamepad* navigator)
</span><span class="lines">@@ -112,11 +106,49 @@
</span><span class="cx"> m_navigators.remove(navigator);
</span><span class="cx"> m_gamepadBlindNavigators.remove(navigator);
</span><span class="cx">
</span><del>- // FIXME: Monitoring gamepads will also be reliant on whether or not there are any
- // connected/disconnected event listeners.
- // Those event listeners will also need to register with the GamepadManager.
- if (m_navigators.isEmpty()) {
- LOG(Gamepad, "GamepadManager unregistered last navigator, is stopping gamepad monitoring");
</del><ins>+ maybeStopMonitoringGamepads();
+}
+
+void GamepadManager::registerDOMWindow(DOMWindow* window)
+{
+ LOG(Gamepad, "GamepadManager registering DOMWindow %p", window);
+
+ ASSERT(!m_domWindows.contains(window));
+ m_domWindows.add(window);
+
+ maybeStartMonitoringGamepads();
+}
+
+void GamepadManager::unregisterDOMWindow(DOMWindow* window)
+{
+ LOG(Gamepad, "GamepadManager unregistering DOMWindow %p", window);
+
+ ASSERT(m_domWindows.contains(window));
+ m_domWindows.remove(window);
+
+ maybeStopMonitoringGamepads();
+}
+
+void GamepadManager::maybeStartMonitoringGamepads()
+{
+ if (m_isMonitoringGamepads)
+ return;
+
+ if (!m_navigators.isEmpty() || !m_domWindows.isEmpty()) {
+ LOG(Gamepad, "GamepadManager has %i NavigatorGamepads and %i DOMWindows registered, is starting gamepad monitoring", m_navigators.size(), m_domWindows.size());
+ m_isMonitoringGamepads = true;
+ GamepadProvider::shared().startMonitoringGamepads(this);
+ }
+}
+
+void GamepadManager::maybeStopMonitoringGamepads()
+{
+ if (!m_isMonitoringGamepads)
+ return;
+
+ if (m_navigators.isEmpty() && m_domWindows.isEmpty()) {
+ LOG(Gamepad, "GamepadManager has no NavigatorGamepads or DOMWindows registered, is stopping gamepad monitoring");
+ m_isMonitoringGamepads = false;
</ins><span class="cx"> GamepadProvider::shared().stopMonitoringGamepads(this);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.h (170910 => 170911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2014-07-09 05:56:45 UTC (rev 170910)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2014-07-09 06:50:35 UTC (rev 170911)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class DOMWindow;
</ins><span class="cx"> class Gamepad;
</span><span class="cx"> class NavigatorGamepad;
</span><span class="cx">
</span><span class="lines">@@ -50,14 +51,22 @@
</span><span class="cx">
</span><span class="cx"> void registerNavigator(NavigatorGamepad*);
</span><span class="cx"> void unregisterNavigator(NavigatorGamepad*);
</span><ins>+ void registerDOMWindow(DOMWindow*);
+ void unregisterDOMWindow(DOMWindow*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> GamepadManager();
</span><span class="cx">
</span><span class="cx"> void makeGamepadsVisibileToBlindNavigators();
</span><span class="cx">
</span><ins>+ void maybeStartMonitoringGamepads();
+ void maybeStopMonitoringGamepads();
+
+ bool m_isMonitoringGamepads;
+
</ins><span class="cx"> HashSet<NavigatorGamepad*> m_navigators;
</span><span class="cx"> HashSet<NavigatorGamepad*> m_gamepadBlindNavigators;
</span><ins>+ HashSet<DOMWindow*> m_domWindows;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (170910 => 170911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2014-07-09 05:56:45 UTC (rev 170910)
+++ trunk/Source/WebCore/dom/EventNames.h 2014-07-09 06:50:35 UTC (rev 170911)
</span><span class="lines">@@ -281,6 +281,11 @@
</span><span class="cx"> macro(gesturechange) \
</span><span class="cx"> macro(gestureend) \
</span><span class="cx"> /* End of ENABLE(IOS_GESTURE_EVENTS) */ \
</span><ins>+ \
+ /* ENABLE(GAMEPAD) */ \
+ macro(gamepadconnected) \
+ macro(gamepaddisconnected) \
+ /* End of ENABLE(GAMEPAD) */ \
</ins><span class="cx">
</span><span class="cx"> // end of DOM_EVENT_NAMES_FOR_EACH
</span><span class="cx">
</span><span class="lines">@@ -319,6 +324,14 @@
</span><span class="cx"> names.append(touchcancelEvent);
</span><span class="cx"> return names;
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(GAMEPAD)
+ inline bool isGamepadEventType(const AtomicString& eventType) const
+ {
+ return eventType == gamepadconnectedEvent
+ || eventType == gamepaddisconnectedEvent;
+ }
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline EventNames& eventNames()
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (170910 => 170911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-07-09 05:56:45 UTC (rev 170910)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-07-09 06:50:35 UTC (rev 170911)
</span><span class="lines">@@ -124,6 +124,10 @@
</span><span class="cx"> #include "RequestAnimationFrameCallback.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+#include "GamepadManager.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> #include "NavigatorGeolocation.h"
</span><span class="lines">@@ -395,6 +399,9 @@
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
</span><span class="cx"> , m_touchEventListenerCount(0)
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(GAMEPAD)
+ , m_gamepadEventListenerCount(0)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(frame());
</span><span class="cx"> ASSERT(DOMWindow::document());
</span><span class="lines">@@ -441,6 +448,11 @@
</span><span class="cx">
</span><span class="cx"> removeAllUnloadEventListeners(this);
</span><span class="cx"> removeAllBeforeUnloadEventListeners(this);
</span><ins>+
+#if ENABLE(GAMEPAD)
+ if (m_gamepadEventListenerCount)
+ GamepadManager::shared().unregisterDOMWindow(this);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMWindow* DOMWindow::toDOMWindow()
</span><span class="lines">@@ -501,6 +513,22 @@
</span><span class="cx"> properties[i]->willDetachGlobalObjectFromFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+void DOMWindow::incrementGamepadEventListenerCount()
+{
+ if (++m_gamepadEventListenerCount == 1)
+ GamepadManager::shared().registerDOMWindow(this);
+}
+
+void DOMWindow::decrementGamepadEventListenerCount()
+{
+ ASSERT(m_gamepadEventListenerCount);
+
+ if (!--m_gamepadEventListenerCount)
+ GamepadManager::shared().unregisterDOMWindow(this);
+}
+#endif
+
</ins><span class="cx"> void DOMWindow::registerProperty(DOMWindowProperty* property)
</span><span class="cx"> {
</span><span class="cx"> m_properties.add(property);
</span><span class="lines">@@ -1708,7 +1736,10 @@
</span><span class="cx"> else if (eventNames().isGestureEventType(eventType))
</span><span class="cx"> ++m_touchEventListenerCount;
</span><span class="cx"> #endif
</span><del>-
</del><ins>+#if ENABLE(GAMEPAD)
+ else if (eventNames().isGamepadEventType(eventType))
+ incrementGamepadEventListenerCount();
+#endif
</ins><span class="cx"> #if ENABLE(PROXIMITY_EVENTS)
</span><span class="cx"> else if (eventType == eventNames().webkitdeviceproximityEvent) {
</span><span class="cx"> if (DeviceProximityController* controller = DeviceProximityController::from(page()))
</span><span class="lines">@@ -1798,7 +1829,10 @@
</span><span class="cx"> --m_touchEventListenerCount;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
</del><ins>+#if ENABLE(GAMEPAD)
+ else if (eventNames().isGamepadEventType(eventType))
+ decrementGamepadEventListenerCount();
+#endif
</ins><span class="cx"> #if ENABLE(PROXIMITY_EVENTS)
</span><span class="cx"> else if (eventType == eventNames().webkitdeviceproximityEvent) {
</span><span class="cx"> if (DeviceProximityController* controller = DeviceProximityController::from(page()))
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (170910 => 170911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2014-07-09 05:56:45 UTC (rev 170910)
+++ trunk/Source/WebCore/page/DOMWindow.h 2014-07-09 06:50:35 UTC (rev 170911)
</span><span class="lines">@@ -465,6 +465,11 @@
</span><span class="cx"> void reconnectDOMWindowProperties();
</span><span class="cx"> void willDestroyDocumentInFrame();
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+ void incrementGamepadEventListenerCount();
+ void decrementGamepadEventListenerCount();
+#endif
+
</ins><span class="cx"> bool m_shouldPrintWhenFinishedLoading;
</span><span class="cx"> bool m_suspendedForPageCache;
</span><span class="cx">
</span><span class="lines">@@ -497,6 +502,9 @@
</span><span class="cx"> unsigned m_touchEventListenerCount;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+ unsigned m_gamepadEventListenerCount;
+#endif
</ins><span class="cx"> mutable RefPtr<Storage> m_sessionStorage;
</span><span class="cx"> mutable RefPtr<Storage> m_localStorage;
</span><span class="cx"> mutable RefPtr<DOMApplicationCache> m_applicationCache;
</span></span></pre>
</div>
</div>
</body>
</html>