<!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>[210871] branches/safari-603-branch/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/210871">210871</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-18 12:43:11 -0800 (Wed, 18 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210761">r210761</a>. rdar://problem/29544024</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadProvidercpp">branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadProviderh">branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebProcessPoolcpp">branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210870 => 210871)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-18 20:43:09 UTC (rev 210870)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-18 20:43:11 UTC (rev 210871)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210761. rdar://problem/29544024
+
+ 2017-01-13 Brady Eidson <beidson@apple.com>
+
+ Crash when visiting a webpage that uses Gamepads in a new WebProcess after a previous page has used gamepads..
+ https://bugs.webkit.org/show_bug.cgi?id=167033
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/Gamepad/UIGamepadProvider.cpp:
+ (WebKit::UIGamepadProvider::processPoolStartedUsingGamepads): Don't schedule a state update here.
+ (WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads): Ditto.
+ * UIProcess/Gamepad/UIGamepadProvider.h:
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::startedUsingGamepads): Populate the WebProcess with initial gamepads.
+
+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210829. rdar://problem/30044439
</span><span class="cx">
</span><span class="cx"> 2017-01-17 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp (210870 => 210871)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2017-01-18 20:43:09 UTC (rev 210870)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2017-01-18 20:43:11 UTC (rev 210871)
</span><span class="lines">@@ -151,8 +151,6 @@
</span><span class="cx">
</span><span class="cx"> if (!m_isMonitoringGamepads && platformWebPageProxyForGamepadInput())
</span><span class="cx"> startMonitoringGamepads();
</span><del>-
- scheduleGamepadStateSync();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::processPoolStoppedUsingGamepads(WebProcessPool& pool)
</span><span class="lines">@@ -162,8 +160,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_isMonitoringGamepads && !platformWebPageProxyForGamepadInput())
</span><span class="cx"> platformStopMonitoringInput();
</span><del>-
- scheduleGamepadStateSync();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UIGamepadProvider::viewBecameActive(WebPageProxy& page)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h (210870 => 210871)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h 2017-01-18 20:43:09 UTC (rev 210870)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h 2017-01-18 20:43:11 UTC (rev 210871)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> static void setUsesGameControllerFramework();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ Vector<GamepadData> snapshotGamepads();
+
</ins><span class="cx"> private:
</span><span class="cx"> friend NeverDestroyed<UIGamepadProvider>;
</span><span class="cx"> UIGamepadProvider();
</span><span class="lines">@@ -77,8 +79,6 @@
</span><span class="cx"> void scheduleGamepadStateSync();
</span><span class="cx"> void gamepadSyncTimerFired();
</span><span class="cx">
</span><del>- Vector<GamepadData> snapshotGamepads();
-
</del><span class="cx"> HashSet<WebProcessPool*> m_processPoolsUsingGamepads;
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<UIGamepad>> m_gamepads;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp (210870 => 210871)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-01-18 20:43:09 UTC (rev 210870)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-01-18 20:43:11 UTC (rev 210871)
</span><span class="lines">@@ -1269,6 +1269,8 @@
</span><span class="cx">
</span><span class="cx"> if (!wereAnyProcessesUsingGamepads)
</span><span class="cx"> UIGamepadProvider::singleton().processPoolStartedUsingGamepads(*this);
</span><ins>+
+ proxy->send(Messages::WebProcess::SetInitialGamepads(UIGamepadProvider::singleton().snapshotGamepads()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::stoppedUsingGamepads(IPC::Connection& connection)
</span></span></pre>
</div>
</div>
</body>
</html>