<!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>[204506] 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/204506">204506</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-08-16 09:27:48 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup WK2 platform gamepad handling.
https://bugs.webkit.org/show_bug.cgi?id=160871
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (No currently testable change in behavior).
This patch does a few things:
1 - Separates the concepts of "monitoring gamepads" and "monitoring gamepad inputs"
2 - Uses this new concept to much more cleanly handle the case where we are not currently
monitoring gamepad inputs because an interested WKWebView is not front and center.
3 - Pre-populates the "initial set of gamepads" in WebProcesses that start listening for gamepads.
* platform/gamepad/GamepadProviderClient.h:
(WebCore::GamepadProviderClient::setInitialConnectedGamepads):
* platform/gamepad/mac/HIDGamepadProvider.cpp:
(WebCore::HIDGamepadProvider::HIDGamepadProvider):
(WebCore::HIDGamepadProvider::stopMonitoringInput):
(WebCore::HIDGamepadProvider::startMonitoringInput):
(WebCore::HIDGamepadProvider::connectionDelayTimerFired):
* platform/gamepad/mac/HIDGamepadProvider.h:
Source/WebKit2:
This patch does a few things:
1 - Separates the concepts of "monitoring gamepads" and "monitoring gamepad inputs"
2 - Uses this new concept to much more cleanly handle the case where we are not currently
monitoring gamepad inputs because an interested WKWebView is not front and center.
3 - Pre-populates the "initial set of gamepads" in WebProcesses that start listening for gamepads.
* Platform/Logging.h:
* UIProcess/Gamepad/UIGamepadProvider.cpp:
(WebKit::UIGamepadProvider::gamepadSyncTimerFired):
(WebKit::UIGamepadProvider::setInitialConnectedGamepads):
(WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads):
(WebKit::UIGamepadProvider::viewBecameActive):
(WebKit::UIGamepadProvider::viewBecameInactive):
(WebKit::UIGamepadProvider::stopMonitoringGamepads):
(WebKit::UIGamepadProvider::snapshotGamepads):
(WebKit::UIGamepadProvider::platformStopMonitoringInput):
(WebKit::UIGamepadProvider::platformStartMonitoringInput):
(WebKit::UIGamepadProvider::UIGamepadProvider): Deleted.
(WebKit::UIGamepadProvider::scheduleDisableGamepadMonitoring): Deleted.
(WebKit::UIGamepadProvider::disableMonitoringTimerFired): Deleted.
* UIProcess/Gamepad/UIGamepadProvider.h:
* UIProcess/Gamepad/mac/UIGamepadProviderHID.cpp:
(WebKit::UIGamepadProvider::platformStopMonitoringInput):
(WebKit::UIGamepadProvider::platformStartMonitoringInput):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::setInitialConnectedGamepads):
* UIProcess/WebProcessPool.h:
* WebProcess/Gamepad/WebGamepadProvider.cpp:
(WebKit::WebGamepadProvider::setInitialGamepads):
* WebProcess/Gamepad/WebGamepadProvider.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setInitialGamepads):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadGamepadProviderClienth">trunk/Source/WebCore/platform/gamepad/GamepadProviderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadmacHIDGamepadProvidercpp">trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadmacHIDGamepadProviderh">trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingh">trunk/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp">trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadUIGamepadProviderh">trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadmacUIGamepadProviderHIDcpp">trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderHID.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessGamepadWebGamepadProvidercpp">trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessGamepadWebGamepadProviderh">trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-16 Brady Eidson <beidson@apple.com>
+
+ Cleanup WK2 platform gamepad handling.
+ https://bugs.webkit.org/show_bug.cgi?id=160871
+
+ Reviewed by Alex Christensen.
+
+ No new tests (No currently testable change in behavior).
+
+ This patch does a few things:
+ 1 - Separates the concepts of "monitoring gamepads" and "monitoring gamepad inputs"
+ 2 - Uses this new concept to much more cleanly handle the case where we are not currently
+ monitoring gamepad inputs because an interested WKWebView is not front and center.
+ 3 - Pre-populates the "initial set of gamepads" in WebProcesses that start listening for gamepads.
+
+ * platform/gamepad/GamepadProviderClient.h:
+ (WebCore::GamepadProviderClient::setInitialConnectedGamepads):
+
+ * platform/gamepad/mac/HIDGamepadProvider.cpp:
+ (WebCore::HIDGamepadProvider::HIDGamepadProvider):
+ (WebCore::HIDGamepadProvider::stopMonitoringInput):
+ (WebCore::HIDGamepadProvider::startMonitoringInput):
+ (WebCore::HIDGamepadProvider::connectionDelayTimerFired):
+ * platform/gamepad/mac/HIDGamepadProvider.h:
+
</ins><span class="cx"> 2016-08-16 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r204494.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadGamepadProviderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/GamepadProviderClient.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/GamepadProviderClient.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebCore/platform/gamepad/GamepadProviderClient.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx">
</span><ins>+#include <wtf/Vector.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class PlatformGamepad;
</span><span class="lines">@@ -35,6 +37,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~GamepadProviderClient() { }
</span><span class="cx">
</span><ins>+ virtual void setInitialConnectedGamepads(const Vector<PlatformGamepad*>&) { }
</ins><span class="cx"> virtual void platformGamepadConnected(PlatformGamepad&) = 0;
</span><span class="cx"> virtual void platformGamepadDisconnected(PlatformGamepad&) = 0;
</span><span class="cx"> virtual void platformGamepadInputActivity() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -96,6 +96,17 @@
</span><span class="cx"> IOHIDManagerSetDeviceMatchingMultiple(m_manager.get(), matchingArray.get());
</span><span class="cx"> IOHIDManagerRegisterDeviceMatchingCallback(m_manager.get(), deviceAddedCallback, this);
</span><span class="cx"> IOHIDManagerRegisterDeviceRemovalCallback(m_manager.get(), deviceRemovedCallback, this);
</span><ins>+
+ startMonitoringInput();
+}
+
+void HIDGamepadProvider::stopMonitoringInput()
+{
+ IOHIDManagerRegisterInputValueCallback(m_manager.get(), nullptr, nullptr);
+}
+
+void HIDGamepadProvider::startMonitoringInput()
+{
</ins><span class="cx"> IOHIDManagerRegisterInputValueCallback(m_manager.get(), deviceValuesChangedCallback, this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,6 +122,9 @@
</span><span class="cx"> void HIDGamepadProvider::connectionDelayTimerFired()
</span><span class="cx"> {
</span><span class="cx"> m_shouldDispatchCallbacks = true;
</span><ins>+
+ for (auto* client : m_clients)
+ client->setInitialConnectedGamepads(m_gamepadVector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HIDGamepadProvider::openAndScheduleManager()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx"> WEBCORE_EXPORT void stopMonitoringGamepads(GamepadProviderClient&) final;
</span><span class="cx"> const Vector<PlatformGamepad*>& platformGamepads() final { return m_gamepadVector; }
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT void stopMonitoringInput();
+ WEBCORE_EXPORT void startMonitoringInput();
+
</ins><span class="cx"> void deviceAdded(IOHIDDeviceRef);
</span><span class="cx"> void deviceRemoved(IOHIDDeviceRef);
</span><span class="cx"> void valuesChanged(IOHIDValueRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-08-16 Brady Eidson <beidson@apple.com>
+
+ Cleanup WK2 platform gamepad handling.
+ https://bugs.webkit.org/show_bug.cgi?id=160871
+
+ Reviewed by Alex Christensen.
+
+ This patch does a few things:
+ 1 - Separates the concepts of "monitoring gamepads" and "monitoring gamepad inputs"
+ 2 - Uses this new concept to much more cleanly handle the case where we are not currently
+ monitoring gamepad inputs because an interested WKWebView is not front and center.
+ 3 - Pre-populates the "initial set of gamepads" in WebProcesses that start listening for gamepads.
+
+ * Platform/Logging.h:
+
+ * UIProcess/Gamepad/UIGamepadProvider.cpp:
+ (WebKit::UIGamepadProvider::gamepadSyncTimerFired):
+ (WebKit::UIGamepadProvider::setInitialConnectedGamepads):
+ (WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads):
+ (WebKit::UIGamepadProvider::viewBecameActive):
+ (WebKit::UIGamepadProvider::viewBecameInactive):
+ (WebKit::UIGamepadProvider::stopMonitoringGamepads):
+ (WebKit::UIGamepadProvider::snapshotGamepads):
+ (WebKit::UIGamepadProvider::platformStopMonitoringInput):
+ (WebKit::UIGamepadProvider::platformStartMonitoringInput):
+ (WebKit::UIGamepadProvider::UIGamepadProvider): Deleted.
+ (WebKit::UIGamepadProvider::scheduleDisableGamepadMonitoring): Deleted.
+ (WebKit::UIGamepadProvider::disableMonitoringTimerFired): Deleted.
+ * UIProcess/Gamepad/UIGamepadProvider.h:
+
+ * UIProcess/Gamepad/mac/UIGamepadProviderHID.cpp:
+ (WebKit::UIGamepadProvider::platformStopMonitoringInput):
+ (WebKit::UIGamepadProvider::platformStartMonitoringInput):
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::setInitialConnectedGamepads):
+ * UIProcess/WebProcessPool.h:
+
+ * WebProcess/Gamepad/WebGamepadProvider.cpp:
+ (WebKit::WebGamepadProvider::setInitialGamepads):
+ * WebProcess/Gamepad/WebGamepadProvider.h:
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::setInitialGamepads):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2016-08-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename SocketStreamHandleBase to SocketStreamHandle and SocketStreamHandle to SocketStreamHandleImpl
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Logging.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/Platform/Logging.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">
</span><span class="cx"> #define WEBKIT2_LOG_CHANNELS(M) \
</span><span class="cx"> M(ContextMenu) \
</span><ins>+ M(Gamepad) \
</ins><span class="cx"> M(IDB) \
</span><span class="cx"> M(IconDatabase) \
</span><span class="cx"> M(IndexedDB) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx">
</span><span class="cx"> UIGamepadProvider::UIGamepadProvider()
</span><span class="cx"> : m_gamepadSyncTimer(RunLoop::main(), this, &UIGamepadProvider::gamepadSyncTimerFired)
</span><del>- , m_disableMonitoringTimer(RunLoop::main(), this, &UIGamepadProvider::disableMonitoringTimerFired)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,17 +63,7 @@
</span><span class="cx"> if (!webPageProxy || !m_processPoolsUsingGamepads.contains(&webPageProxy->process().processPool()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Vector<GamepadData> gamepadDatas;
- gamepadDatas.reserveInitialCapacity(m_gamepads.size());
-
- for (auto& gamepad : m_gamepads) {
- if (gamepad)
- gamepadDatas.uncheckedAppend(gamepad->gamepadData());
- else
- gamepadDatas.uncheckedAppend({ });
- }
-
- webPageProxy->gamepadActivity(gamepadDatas);
</del><ins>+ webPageProxy->gamepadActivity(snapshotGamepads());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::scheduleGamepadStateSync()
</span><span class="lines">@@ -90,6 +79,24 @@
</span><span class="cx"> m_gamepadSyncTimer.startOneShot(maximumGamepadUpdateInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIGamepadProvider::setInitialConnectedGamepads(const Vector<PlatformGamepad*>& initialGamepads)
+{
+ ASSERT(!m_hasInitialGamepads);
+
+ m_gamepads.resize(initialGamepads.size());
+
+ for (auto* gamepad : initialGamepads) {
+ if (!gamepad)
+ continue;
+ m_gamepads[gamepad->index()] = std::make_unique<UIGamepad>(*gamepad);
+ }
+
+ for (auto& pool : m_processPoolsUsingGamepads)
+ pool->setInitialConnectedGamepads(m_gamepads);
+
+ m_hasInitialGamepads = true;
+}
+
</ins><span class="cx"> void UIGamepadProvider::platformGamepadConnected(PlatformGamepad& gamepad)
</span><span class="cx"> {
</span><span class="cx"> if (m_gamepads.size() <= gamepad.index())
</span><span class="lines">@@ -152,7 +159,7 @@
</span><span class="cx"> m_processPoolsUsingGamepads.remove(&pool);
</span><span class="cx">
</span><span class="cx"> if (m_isMonitoringGamepads && !platformWebPageProxyForGamepadInput())
</span><del>- scheduleDisableGamepadMonitoring();
</del><ins>+ platformStopMonitoringInput();
</ins><span class="cx">
</span><span class="cx"> scheduleGamepadStateSync();
</span><span class="cx"> }
</span><span class="lines">@@ -162,8 +169,11 @@
</span><span class="cx"> if (!m_processPoolsUsingGamepads.contains(&page.process().processPool()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_disableMonitoringTimer.stop();
- startMonitoringGamepads();
</del><ins>+ if (!m_isMonitoringGamepads)
+ startMonitoringGamepads();
+
+ if (platformWebPageProxyForGamepadInput())
+ platformStartMonitoringInput();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::viewBecameInactive(WebPageProxy& page)
</span><span class="lines">@@ -170,20 +180,9 @@
</span><span class="cx"> {
</span><span class="cx"> auto pageForGamepadInput = platformWebPageProxyForGamepadInput();
</span><span class="cx"> if (pageForGamepadInput == &page)
</span><del>- scheduleDisableGamepadMonitoring();
</del><ins>+ platformStopMonitoringInput();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UIGamepadProvider::scheduleDisableGamepadMonitoring()
-{
- if (!m_disableMonitoringTimer.isActive())
- m_disableMonitoringTimer.startOneShot(0);
-}
-
-void UIGamepadProvider::disableMonitoringTimerFired()
-{
- stopMonitoringGamepads();
-}
-
</del><span class="cx"> void UIGamepadProvider::startMonitoringGamepads()
</span><span class="cx"> {
</span><span class="cx"> if (m_isMonitoringGamepads)
</span><span class="lines">@@ -200,8 +199,24 @@
</span><span class="cx">
</span><span class="cx"> m_isMonitoringGamepads = false;
</span><span class="cx"> platformStopMonitoringGamepads();
</span><ins>+ m_gamepads.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<GamepadData> UIGamepadProvider::snapshotGamepads()
+{
+ Vector<GamepadData> gamepadDatas;
+ gamepadDatas.reserveInitialCapacity(m_gamepads.size());
+
+ for (auto& gamepad : m_gamepads) {
+ if (gamepad)
+ gamepadDatas.uncheckedAppend(gamepad->gamepadData());
+ else
+ gamepadDatas.uncheckedAppend({ });
+ }
+
+ return gamepadDatas;
+}
+
</ins><span class="cx"> #if !PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::platformStartMonitoringGamepads()
</span><span class="lines">@@ -227,6 +242,14 @@
</span><span class="cx"> // FIXME: Implement for other platforms
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIGamepadProvider::platformStopMonitoringInput()
+{
+}
+
+void UIGamepadProvider::platformStartMonitoringInput()
+{
+}
+
</ins><span class="cx"> #endif // !PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadUIGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -64,7 +64,10 @@
</span><span class="cx"> void platformStopMonitoringGamepads();
</span><span class="cx"> const Vector<WebCore::PlatformGamepad*>& platformGamepads();
</span><span class="cx"> WebPageProxy* platformWebPageProxyForGamepadInput();
</span><ins>+ void platformStopMonitoringInput();
+ void platformStartMonitoringInput();
</ins><span class="cx">
</span><ins>+ void setInitialConnectedGamepads(const Vector<WebCore::PlatformGamepad*>&) final;
</ins><span class="cx"> void platformGamepadConnected(WebCore::PlatformGamepad&) final;
</span><span class="cx"> void platformGamepadDisconnected(WebCore::PlatformGamepad&) final;
</span><span class="cx"> void platformGamepadInputActivity() final;
</span><span class="lines">@@ -72,8 +75,7 @@
</span><span class="cx"> void scheduleGamepadStateSync();
</span><span class="cx"> void gamepadSyncTimerFired();
</span><span class="cx">
</span><del>- void scheduleDisableGamepadMonitoring();
- void disableMonitoringTimerFired();
</del><ins>+ Vector<GamepadData> snapshotGamepads();
</ins><span class="cx">
</span><span class="cx"> HashSet<WebProcessPool*> m_processPoolsUsingGamepads;
</span><span class="cx">
</span><span class="lines">@@ -80,9 +82,9 @@
</span><span class="cx"> Vector<std::unique_ptr<UIGamepad>> m_gamepads;
</span><span class="cx">
</span><span class="cx"> RunLoop::Timer<UIGamepadProvider> m_gamepadSyncTimer;
</span><del>- RunLoop::Timer<UIGamepadProvider> m_disableMonitoringTimer;
</del><span class="cx">
</span><span class="cx"> bool m_isMonitoringGamepads { false };
</span><ins>+ bool m_hasInitialGamepads { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadmacUIGamepadProviderHIDcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderHID.cpp (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderHID.cpp 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderHID.cpp 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -51,6 +51,16 @@
</span><span class="cx"> return HIDGamepadProvider::singleton().platformGamepads();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIGamepadProvider::platformStopMonitoringInput()
+{
+ return HIDGamepadProvider::singleton().stopMonitoringInput();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIGamepadProvider::platformStartMonitoringInput()
+{
+ return HIDGamepadProvider::singleton().startMonitoringInput();
+}
+
+}
+
</ins><span class="cx"> #endif // ENABLE(GAMEPAD)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -1286,6 +1286,20 @@
</span><span class="cx"> process->send(Messages::WebProcess::GamepadDisconnected(gamepad.index()), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessPool::setInitialConnectedGamepads(const Vector<std::unique_ptr<UIGamepad>>& gamepads)
+{
+ Vector<GamepadData> gamepadDatas;
+ gamepadDatas.resize(gamepads.size());
+ for (size_t i = 0; i < gamepads.size(); ++i) {
+ if (!gamepads[i])
+ continue;
+ gamepadDatas[i] = gamepads[i]->gamepadData();
+ }
+
+ for (auto& process : m_processesUsingGamepads)
+ process->send(Messages::WebProcess::SetInitialGamepads(gamepadDatas), 0);
+}
+
</ins><span class="cx"> #endif // ENABLE(GAMEPAD)
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::garbageCollectJavaScriptObjects()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -370,6 +370,8 @@
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> void gamepadConnected(const UIGamepad&);
</span><span class="cx"> void gamepadDisconnected(const UIGamepad&);
</span><ins>+
+ void setInitialConnectedGamepads(const Vector<std::unique_ptr<UIGamepad>>&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessGamepadWebGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.cpp (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.cpp 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.cpp 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -53,6 +53,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebGamepadProvider::setInitialGamepads(const Vector<GamepadData>& gamepadDatas)
+{
+ ASSERT(m_gamepads.isEmpty());
+
+ m_gamepads.resize(gamepadDatas.size());
+ m_rawGamepads.resize(gamepadDatas.size());
+ for (size_t i = 0; i < gamepadDatas.size(); ++i) {
+ if (gamepadDatas[i].isNull())
+ continue;
+
+ m_gamepads[i] = std::make_unique<WebGamepad>(gamepadDatas[i]);
+ m_rawGamepads[i] = m_gamepads[i].get();
+ }
+}
+
</ins><span class="cx"> void WebGamepadProvider::gamepadConnected(const GamepadData& gamepadData)
</span><span class="cx"> {
</span><span class="cx"> if (m_gamepads.size() <= gamepadData.index) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessGamepadWebGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> void gamepadDisconnected(unsigned index);
</span><span class="cx"> void gamepadActivity(const Vector<GamepadData>&);
</span><span class="cx">
</span><ins>+ void setInitialGamepads(const Vector<GamepadData>&);
+
</ins><span class="cx"> private:
</span><span class="cx"> friend NeverDestroyed<WebGamepadProvider>;
</span><span class="cx"> WebGamepadProvider();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -1030,6 +1030,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx">
</span><ins>+void WebProcess::setInitialGamepads(const Vector<WebKit::GamepadData>& gamepadDatas)
+{
+ WebGamepadProvider::singleton().setInitialGamepads(gamepadDatas);
+}
+
</ins><span class="cx"> void WebProcess::gamepadConnected(const GamepadData& gamepadData)
</span><span class="cx"> {
</span><span class="cx"> WebGamepadProvider::singleton().gamepadConnected(gamepadData);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -276,6 +276,7 @@
</span><span class="cx"> void mainThreadPing();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><ins>+ void setInitialGamepads(const Vector<GamepadData>&);
</ins><span class="cx"> void gamepadConnected(const GamepadData&);
</span><span class="cx"> void gamepadDisconnected(unsigned index);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (204505 => 204506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-08-16 16:23:45 UTC (rev 204505)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-08-16 16:27:48 UTC (rev 204506)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> MainThreadPing()
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><ins>+ SetInitialGamepads(Vector<WebKit::GamepadData> gamepadDatas)
</ins><span class="cx"> GamepadConnected(struct WebKit::GamepadData gamepadData)
</span><span class="cx"> GamepadDisconnected(unsigned index)
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>