<!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>[210873] branches/safari-603-branch</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/210873">210873</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-18 12:43:17 -0800 (Wed, 18 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210827">r210827</a>. rdar://problem/28620865</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsgamepadgamepadtimestamphtml">branches/safari-603-branch/LayoutTests/gamepad/gamepad-timestamp.html</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedGamepadGamepadDatacpp">branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedGamepadGamepadDatah">branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadcpp">branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadh">branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessGamepadWebGamepadcpp">branches/safari-603-branch/Source/WebKit2/WebProcess/Gamepad/WebGamepad.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210827. rdar://problem/28620865
+
+ 2017-01-17 Brady Eidson <beidson@apple.com>
+
+ An update to one gamepad's values should only change that gamepad's modified timestamp.
+ <rdar://problem/28620865> and https://bugs.webkit.org/show_bug.cgi?id=167139
+
+ Reviewed by Andy Estes.
+
+ * gamepad/gamepad-timestamp.html:
+
</ins><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210447. rdar://problem/29872292
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsgamepadgamepadtimestamphtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/gamepad/gamepad-timestamp.html (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/gamepad/gamepad-timestamp.html 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/LayoutTests/gamepad/gamepad-timestamp.html 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -20,11 +20,21 @@
</span><span class="cx"> var rafCount = 0;
</span><span class="cx"> var increasingTimestampsSeen = 0;
</span><span class="cx"> var timestamp = 0;
</span><ins>+var gamepad2Timestamp = -1;
</ins><span class="cx">
</span><span class="cx"> function rafCallback()
</span><span class="cx"> {
</span><span class="cx"> var gamepad = navigator.getGamepads()[0];
</span><del>-
</del><ins>+ var gamepad2 = navigator.getGamepads()[1];
+
+ if (gamepad2Timestamp == -1)
+ gamepad2Timestamp = gamepad2.timestamp;
+
+ if (gamepad2Timestamp != gamepad2.timestamp) {
+ log("Timestamp of gamepad 2 should never change throughout this test, but it did!");
+ finishTest();
+ }
+
</ins><span class="cx"> if (gamepad.timestamp < timestamp) {
</span><span class="cx"> log("Timestamp on gamepad is " + gamepad.timestamp + " which is less than " + timestamp);
</span><span class="cx"> finishTest();
</span><span class="lines">@@ -68,6 +78,12 @@
</span><span class="cx"> testRunner.setMockGamepadButtonValue(0, 0, 1.0);
</span><span class="cx"> testRunner.setMockGamepadButtonValue(0, 1, 1.0);
</span><span class="cx"> testRunner.connectMockGamepad(0);
</span><ins>+ testRunner.setMockGamepadDetails(1, "Test Joystick 2", 2, 2);
+ testRunner.setMockGamepadAxisValue(1, 0, 0.7);
+ testRunner.setMockGamepadAxisValue(1, 1, -1.0);
+ testRunner.setMockGamepadButtonValue(1, 0, 1.0);
+ testRunner.setMockGamepadButtonValue(1, 1, 1.0);
+ testRunner.connectMockGamepad(1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210827. rdar://problem/28620865
+
+ 2017-01-17 Brady Eidson <beidson@apple.com>
+
+ An update to one gamepad's values should only change that gamepad's modified timestamp.
+ <rdar://problem/28620865> and https://bugs.webkit.org/show_bug.cgi?id=167139
+
+ Reviewed by Andy Estes.
+
+ Track the lastModifiedTime for a gamepad in the UI process, and pass it along to web processes.
+
+ * Shared/Gamepad/GamepadData.cpp:
+ (WebKit::GamepadData::GamepadData):
+ (WebKit::GamepadData::encode):
+ (WebKit::GamepadData::decode):
+ * Shared/Gamepad/GamepadData.h:
+ (WebKit::GamepadData::lastUpdateTime):
+
+ * UIProcess/Gamepad/UIGamepad.cpp:
+ (WebKit::UIGamepad::UIGamepad):
+ (WebKit::UIGamepad::updateFromPlatformGamepad):
+ (WebKit::UIGamepad::condensedGamepadData):
+ (WebKit::UIGamepad::fullGamepadData):
+ * UIProcess/Gamepad/UIGamepad.h:
+
+ * WebProcess/Gamepad/WebGamepad.cpp:
+ (WebKit::WebGamepad::updateValues):
+
+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210761. rdar://problem/29544024
</span><span class="cx">
</span><span class="cx"> 2017-01-13 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedGamepadGamepadDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.cpp (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.cpp 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.cpp 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -33,18 +33,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-GamepadData::GamepadData(unsigned index, const Vector<double>& axisValues, const Vector<double>& buttonValues)
</del><ins>+GamepadData::GamepadData(unsigned index, const Vector<double>& axisValues, const Vector<double>& buttonValues, double lastUpdateTime)
</ins><span class="cx"> : m_index(index)
</span><span class="cx"> , m_axisValues(axisValues)
</span><span class="cx"> , m_buttonValues(buttonValues)
</span><ins>+ , m_lastUpdateTime(lastUpdateTime)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GamepadData::GamepadData(unsigned index, const String& id, const Vector<double>& axisValues, const Vector<double>& buttonValues)
</del><ins>+GamepadData::GamepadData(unsigned index, const String& id, const Vector<double>& axisValues, const Vector<double>& buttonValues, double lastUpdateTime)
</ins><span class="cx"> : m_index(index)
</span><span class="cx"> , m_id(id)
</span><span class="cx"> , m_axisValues(axisValues)
</span><span class="cx"> , m_buttonValues(buttonValues)
</span><ins>+ , m_lastUpdateTime(lastUpdateTime)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -54,7 +56,7 @@
</span><span class="cx"> if (m_isNull)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- encoder << m_index << m_id << m_axisValues << m_buttonValues;
</del><ins>+ encoder << m_index << m_id << m_axisValues << m_buttonValues << m_lastUpdateTime;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool GamepadData::decode(IPC::Decoder& decoder, GamepadData& data)
</span><span class="lines">@@ -77,6 +79,9 @@
</span><span class="cx"> if (!decoder.decode(data.m_buttonValues))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(data.m_lastUpdateTime))
+ return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedGamepadGamepadDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.h (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.h 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/Source/WebKit2/Shared/Gamepad/GamepadData.h 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GamepadData(unsigned index, const Vector<double>& axisValues, const Vector<double>& buttonValues);
- GamepadData(unsigned index, const String& id, const Vector<double>& axisValues, const Vector<double>& buttonValues);
</del><ins>+ GamepadData(unsigned index, const Vector<double>& axisValues, const Vector<double>& buttonValues, double lastUpdateTime);
+ GamepadData(unsigned index, const String& id, const Vector<double>& axisValues, const Vector<double>& buttonValues, double lastUpdateTime);
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::Encoder&) const;
</span><span class="cx"> static bool decode(IPC::Decoder&, GamepadData&);
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> bool isNull() const { return m_isNull; }
</span><span class="cx">
</span><ins>+ double lastUpdateTime() const { return m_lastUpdateTime; }
</ins><span class="cx"> unsigned index() const { return m_index; }
</span><span class="cx"> const String& id() const { return m_id; }
</span><span class="cx"> const Vector<double>& axisValues() const { return m_axisValues; }
</span><span class="lines">@@ -62,6 +63,7 @@
</span><span class="cx"> String m_id;
</span><span class="cx"> Vector<double> m_axisValues;
</span><span class="cx"> Vector<double> m_buttonValues;
</span><ins>+ double m_lastUpdateTime { 0.0 };
</ins><span class="cx">
</span><span class="cx"> bool m_isNull { false };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.cpp (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.cpp 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.cpp 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> UIGamepad::UIGamepad(WebCore::PlatformGamepad& platformGamepad)
</span><span class="cx"> : m_index(platformGamepad.index())
</span><span class="cx"> , m_id(platformGamepad.id())
</span><ins>+ , m_lastUpdateTime(platformGamepad.lastUpdateTime())
</ins><span class="cx"> {
</span><span class="cx"> m_axisValues.resize(platformGamepad.axisValues().size());
</span><span class="cx"> m_buttonValues.resize(platformGamepad.buttonValues().size());
</span><span class="lines">@@ -53,16 +54,17 @@
</span><span class="cx">
</span><span class="cx"> m_axisValues = platformGamepad.axisValues();
</span><span class="cx"> m_buttonValues = platformGamepad.buttonValues();
</span><ins>+ m_lastUpdateTime = platformGamepad.lastUpdateTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GamepadData UIGamepad::condensedGamepadData() const
</span><span class="cx"> {
</span><del>- return { m_index, m_axisValues, m_buttonValues };
</del><ins>+ return { m_index, m_axisValues, m_buttonValues, m_lastUpdateTime };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GamepadData UIGamepad::fullGamepadData() const
</span><span class="cx"> {
</span><del>- return { m_index, m_id, m_axisValues, m_buttonValues };
</del><ins>+ return { m_index, m_id, m_axisValues, m_buttonValues, m_lastUpdateTime };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessGamepadUIGamepadh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.h (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.h 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepad.h 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> String m_id;
</span><span class="cx"> Vector<double> m_axisValues;
</span><span class="cx"> Vector<double> m_buttonValues;
</span><ins>+ double m_lastUpdateTime;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessGamepadWebGamepadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/Gamepad/WebGamepad.cpp (210872 => 210873)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/Gamepad/WebGamepad.cpp 2017-01-18 20:43:13 UTC (rev 210872)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/Gamepad/WebGamepad.cpp 2017-01-18 20:43:17 UTC (rev 210873)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> m_axisValues = gamepadData.axisValues();
</span><span class="cx"> m_buttonValues = gamepadData.buttonValues();
</span><span class="cx">
</span><del>- m_lastUpdateTime = monotonicallyIncreasingTime();
</del><ins>+ m_lastUpdateTime = gamepadData.lastUpdateTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>