<!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>[204401] trunk/Source/WebKit2</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/204401">204401</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-08-11 18:29:52 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Don't monitor gamepads at all unless an interested WebPageProxy is in the active window.
https://bugs.webkit.org/show_bug.cgi?id=160760
Reviewed by Tim Horton.
This patch makes it such that the UIProcess will only listen to the platform gamepad mechanism
if a WebPageProxy that is interested in gamepads is in the active window.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::windowDidBecomeKey):
(WebKit::WebViewImpl::windowDidResignKey):
* UIProcess/Gamepad/UIGamepadProvider.cpp:
(WebKit::UIGamepadProvider::UIGamepadProvider):
(WebKit::UIGamepadProvider::gamepadSyncTimerFired):
(WebKit::UIGamepadProvider::scheduleGamepadStateSync):
(WebKit::UIGamepadProvider::platformGamepadConnected):
(WebKit::UIGamepadProvider::platformGamepadDisconnected):
(WebKit::UIGamepadProvider::platformGamepadInputActivity):
(WebKit::UIGamepadProvider::processPoolStartedUsingGamepads):
(WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads):
(WebKit::UIGamepadProvider::viewBecameActive):
(WebKit::UIGamepadProvider::viewBecameInactive):
(WebKit::UIGamepadProvider::scheduleDisableGamepadMonitoring):
(WebKit::UIGamepadProvider::disableMonitoringTimerFired):
(WebKit::UIGamepadProvider::startMonitoringGamepads):
(WebKit::UIGamepadProvider::stopMonitoringGamepads):
(WebKit::UIGamepadProvider::updateTimerFired): Deleted.
(WebKit::UIGamepadProvider::startOrStopSynchingGamepadState): Deleted.
* UIProcess/Gamepad/UIGamepadProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204400 => 204401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-12 01:22:55 UTC (rev 204400)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-12 01:29:52 UTC (rev 204401)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-08-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ [WK2] Don't monitor gamepads at all unless an interested WebPageProxy is in the active window.
+ https://bugs.webkit.org/show_bug.cgi?id=160760
+
+ Reviewed by Tim Horton.
+
+ This patch makes it such that the UIProcess will only listen to the platform gamepad mechanism
+ if a WebPageProxy that is interested in gamepads is in the active window.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::windowDidBecomeKey):
+ (WebKit::WebViewImpl::windowDidResignKey):
+
+ * UIProcess/Gamepad/UIGamepadProvider.cpp:
+ (WebKit::UIGamepadProvider::UIGamepadProvider):
+ (WebKit::UIGamepadProvider::gamepadSyncTimerFired):
+ (WebKit::UIGamepadProvider::scheduleGamepadStateSync):
+ (WebKit::UIGamepadProvider::platformGamepadConnected):
+ (WebKit::UIGamepadProvider::platformGamepadDisconnected):
+ (WebKit::UIGamepadProvider::platformGamepadInputActivity):
+ (WebKit::UIGamepadProvider::processPoolStartedUsingGamepads):
+ (WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads):
+ (WebKit::UIGamepadProvider::viewBecameActive):
+ (WebKit::UIGamepadProvider::viewBecameInactive):
+ (WebKit::UIGamepadProvider::scheduleDisableGamepadMonitoring):
+ (WebKit::UIGamepadProvider::disableMonitoringTimerFired):
+ (WebKit::UIGamepadProvider::startMonitoringGamepads):
+ (WebKit::UIGamepadProvider::stopMonitoringGamepads):
+ (WebKit::UIGamepadProvider::updateTimerFired): Deleted.
+ (WebKit::UIGamepadProvider::startOrStopSynchingGamepadState): Deleted.
+ * UIProcess/Gamepad/UIGamepadProvider.h:
+
+2016-08-11 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Make Gamepads be a WK2 ExperimentalFeature.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160788
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (204400 => 204401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-08-12 01:22:55 UTC (rev 204400)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-08-12 01:29:52 UTC (rev 204401)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "TextCheckerState.h"
</span><span class="cx"> #import "TiledCoreAnimationDrawingAreaProxy.h"
</span><ins>+#import "UIGamepadProvider.h"
</ins><span class="cx"> #import "ViewGestureController.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKFullScreenWindowController.h"
</span><span class="lines">@@ -1056,6 +1057,9 @@
</span><span class="cx"> void WebViewImpl::windowDidBecomeKey(NSWindow *keyWindow)
</span><span class="cx"> {
</span><span class="cx"> if (keyWindow == m_view.window || keyWindow == m_view.window.attachedSheet) {
</span><ins>+#if ENABLE(GAMEPAD)
+ UIGamepadProvider::singleton().viewBecameActive(m_page.get());
+#endif
</ins><span class="cx"> updateSecureInputState();
</span><span class="cx"> m_page->viewStateDidChange(WebCore::ViewState::WindowIsActive);
</span><span class="cx"> }
</span><span class="lines">@@ -1064,6 +1068,9 @@
</span><span class="cx"> void WebViewImpl::windowDidResignKey(NSWindow *formerKeyWindow)
</span><span class="cx"> {
</span><span class="cx"> if (formerKeyWindow == m_view.window || formerKeyWindow == m_view.window.attachedSheet) {
</span><ins>+#if ENABLE(GAMEPAD)
+ UIGamepadProvider::singleton().viewBecameInactive(m_page.get());
+#endif
</ins><span class="cx"> updateSecureInputState();
</span><span class="cx"> m_page->viewStateDidChange(WebCore::ViewState::WindowIsActive);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp (204400 => 204401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-08-12 01:22:55 UTC (rev 204400)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-08-12 01:29:52 UTC (rev 204401)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static const double gamepadUpdateInterval = 1 / 60.0;
</del><ins>+static const double maximumGamepadUpdateInterval = 1 / 120.0;
</ins><span class="cx">
</span><span class="cx"> UIGamepadProvider& UIGamepadProvider::singleton()
</span><span class="cx"> {
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UIGamepadProvider::UIGamepadProvider()
</span><del>- : m_timer(*this, &UIGamepadProvider::updateTimerFired)
</del><ins>+ : m_gamepadSyncTimer(RunLoop::main(), this, &UIGamepadProvider::gamepadSyncTimerFired)
+ , m_disableMonitoringTimer(RunLoop::main(), this, &UIGamepadProvider::disableMonitoringTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -57,9 +58,10 @@
</span><span class="cx"> platformStopMonitoringGamepads();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIGamepadProvider::updateTimerFired()
</del><ins>+void UIGamepadProvider::gamepadSyncTimerFired()
</ins><span class="cx"> {
</span><del>- if (!m_hadActivitySinceLastSynch)
</del><ins>+ auto webPageProxy = platformWebPageProxyForGamepadInput();
+ if (!webPageProxy || !m_processPoolsUsingGamepads.contains(&webPageProxy->process().processPool()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Vector<GamepadData> gamepadDatas;
</span><span class="lines">@@ -72,24 +74,20 @@
</span><span class="cx"> gamepadDatas.uncheckedAppend({ });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto webPageProxy = platformWebPageProxyForGamepadInput();
- if (webPageProxy && m_processPoolsUsingGamepads.contains(&webPageProxy->process().processPool()))
- webPageProxy->gamepadActivity(gamepadDatas);
-
- m_hadActivitySinceLastSynch = false;
</del><ins>+ webPageProxy->gamepadActivity(gamepadDatas);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UIGamepadProvider::startOrStopSynchingGamepadState()
</del><ins>+void UIGamepadProvider::scheduleGamepadStateSync()
</ins><span class="cx"> {
</span><del>- // FIXME (https://bugs.webkit.org/show_bug.cgi?id=160699)
- // Only start synching updates if the currently focused WKWebView is also listening for gamepads.
</del><ins>+ if (!m_isMonitoringGamepads || m_gamepadSyncTimer.isActive())
+ return;
</ins><span class="cx">
</span><del>- // FIXME (https://bugs.webkit.org/show_bug.cgi?id=160673)
- // Instead of refreshing gamepad data on a 60hz timer, actually sync with the display.
- if (m_gamepads.isEmpty() || m_processPoolsUsingGamepads.isEmpty())
- m_timer.stop();
- else
- m_timer.startRepeating(gamepadUpdateInterval);
</del><ins>+ if (m_gamepads.isEmpty() || m_processPoolsUsingGamepads.isEmpty()) {
+ m_gamepadSyncTimer.stop();
+ return;
+ }
+
+ m_gamepadSyncTimer.startOneShot(maximumGamepadUpdateInterval);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::platformGamepadConnected(PlatformGamepad& gamepad)
</span><span class="lines">@@ -100,8 +98,7 @@
</span><span class="cx"> ASSERT(!m_gamepads[gamepad.index()]);
</span><span class="cx"> m_gamepads[gamepad.index()] = std::make_unique<UIGamepad>(gamepad);
</span><span class="cx">
</span><del>- m_hadActivitySinceLastSynch = true;
- startOrStopSynchingGamepadState();
</del><ins>+ scheduleGamepadStateSync();
</ins><span class="cx">
</span><span class="cx"> for (auto& pool : m_processPoolsUsingGamepads)
</span><span class="cx"> pool->gamepadConnected(*m_gamepads[gamepad.index()]);
</span><span class="lines">@@ -114,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<UIGamepad> disconnectedGamepad = WTFMove(m_gamepads[gamepad.index()]);
</span><span class="cx">
</span><del>- startOrStopSynchingGamepadState();
</del><ins>+ scheduleGamepadStateSync();
</ins><span class="cx">
</span><span class="cx"> for (auto& pool : m_processPoolsUsingGamepads)
</span><span class="cx"> pool->gamepadDisconnected(*disconnectedGamepad);
</span><span class="lines">@@ -135,35 +132,76 @@
</span><span class="cx"> m_gamepads[i]->updateFromPlatformGamepad(*platformGamepads[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_hadActivitySinceLastSynch = true;
</del><ins>+ scheduleGamepadStateSync();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::processPoolStartedUsingGamepads(WebProcessPool& pool)
</span><span class="cx"> {
</span><del>- bool wereAnyProcessPoolsUsingGamepads = !m_processPoolsUsingGamepads.isEmpty();
-
</del><span class="cx"> ASSERT(!m_processPoolsUsingGamepads.contains(&pool));
</span><span class="cx"> m_processPoolsUsingGamepads.add(&pool);
</span><span class="cx">
</span><del>- if (!wereAnyProcessPoolsUsingGamepads)
- platformStartMonitoringGamepads();
</del><ins>+ if (!m_isMonitoringGamepads && platformWebPageProxyForGamepadInput())
+ startMonitoringGamepads();
</ins><span class="cx">
</span><del>- startOrStopSynchingGamepadState();
</del><ins>+ scheduleGamepadStateSync();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::processPoolStoppedUsingGamepads(WebProcessPool& pool)
</span><span class="cx"> {
</span><del>- bool wereAnyProcessPoolsUsingGamepads = !m_processPoolsUsingGamepads.isEmpty();
-
</del><span class="cx"> ASSERT(m_processPoolsUsingGamepads.contains(&pool));
</span><span class="cx"> m_processPoolsUsingGamepads.remove(&pool);
</span><span class="cx">
</span><del>- if (wereAnyProcessPoolsUsingGamepads && m_processPoolsUsingGamepads.isEmpty())
- platformStopMonitoringGamepads();
</del><ins>+ if (m_isMonitoringGamepads && !platformWebPageProxyForGamepadInput())
+ scheduleDisableGamepadMonitoring();
</ins><span class="cx">
</span><del>- startOrStopSynchingGamepadState();
</del><ins>+ scheduleGamepadStateSync();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIGamepadProvider::viewBecameActive(WebPageProxy& page)
+{
+ if (!m_processPoolsUsingGamepads.contains(&page.process().processPool()))
+ return;
+
+ m_disableMonitoringTimer.stop();
+ startMonitoringGamepads();
+}
+
+void UIGamepadProvider::viewBecameInactive(WebPageProxy& page)
+{
+ auto pageForGamepadInput = platformWebPageProxyForGamepadInput();
+ if (pageForGamepadInput == &page)
+ scheduleDisableGamepadMonitoring();
+}
+
+void UIGamepadProvider::scheduleDisableGamepadMonitoring()
+{
+ if (!m_disableMonitoringTimer.isActive())
+ m_disableMonitoringTimer.startOneShot(0);
+}
+
+void UIGamepadProvider::disableMonitoringTimerFired()
+{
+ stopMonitoringGamepads();
+}
+
+void UIGamepadProvider::startMonitoringGamepads()
+{
+ if (m_isMonitoringGamepads)
+ return;
+
+ m_isMonitoringGamepads = true;
+ platformStartMonitoringGamepads();
+}
+
+void UIGamepadProvider::stopMonitoringGamepads()
+{
+ if (!m_isMonitoringGamepads)
+ return;
+
+ m_isMonitoringGamepads = false;
+ platformStopMonitoringGamepads();
+}
+
</ins><span class="cx"> #if !PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::platformStartMonitoringGamepads()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadUIGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h (204400 => 204401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h 2016-08-12 01:22:55 UTC (rev 204400)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h 2016-08-12 01:29:52 UTC (rev 204401)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx">
</span><span class="cx"> #include <WebCore/GamepadProviderClient.h>
</span><del>-#include <WebCore/Timer.h>
</del><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx"> void processPoolStartedUsingGamepads(WebProcessPool&);
</span><span class="cx"> void processPoolStoppedUsingGamepads(WebProcessPool&);
</span><span class="cx">
</span><ins>+ void viewBecameActive(WebPageProxy&);
+ void viewBecameInactive(WebPageProxy&);
+
</ins><span class="cx"> Vector<GamepadData> gamepadStates() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -54,6 +57,9 @@
</span><span class="cx"> UIGamepadProvider();
</span><span class="cx"> ~UIGamepadProvider() final;
</span><span class="cx">
</span><ins>+ void startMonitoringGamepads();
+ void stopMonitoringGamepads();
+
</ins><span class="cx"> void platformStartMonitoringGamepads();
</span><span class="cx"> void platformStopMonitoringGamepads();
</span><span class="cx"> const Vector<WebCore::PlatformGamepad*>& platformGamepads();
</span><span class="lines">@@ -63,15 +69,20 @@
</span><span class="cx"> void platformGamepadDisconnected(WebCore::PlatformGamepad&) final;
</span><span class="cx"> void platformGamepadInputActivity() final;
</span><span class="cx">
</span><del>- void startOrStopSynchingGamepadState();
- void updateTimerFired();
</del><ins>+ void scheduleGamepadStateSync();
+ void gamepadSyncTimerFired();
</ins><span class="cx">
</span><ins>+ void scheduleDisableGamepadMonitoring();
+ void disableMonitoringTimerFired();
+
</ins><span class="cx"> HashSet<WebProcessPool*> m_processPoolsUsingGamepads;
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<UIGamepad>> m_gamepads;
</span><span class="cx">
</span><del>- WebCore::Timer m_timer;
- bool m_hadActivitySinceLastSynch { false };
</del><ins>+ RunLoop::Timer<UIGamepadProvider> m_gamepadSyncTimer;
+ RunLoop::Timer<UIGamepadProvider> m_disableMonitoringTimer;
+
+ bool m_isMonitoringGamepads { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>