<!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>[170551] 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/170551">170551</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-06-27 13:53:14 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>HIDGamepads should populate themselves with initial input values
https://bugs.webkit.org/show_bug.cgi?id=134381
Reviewed by Darin Adler.
No new tests (Not yet a tested config)
* platform/mac/HIDGamepad.cpp:
(WebCore::HIDGamepad::getCurrentValueForElement):
(WebCore::HIDGamepad::initElements): Loop through all the saved elements to get current values.
(WebCore::HIDGamepad::maybeAddButton):
(WebCore::HIDGamepad::maybeAddAxis):
* platform/mac/HIDGamepad.h:
(WebCore::HIDGamepadElement::HIDGamepadElement):
(WebCore::HIDGamepadButton::HIDGamepadButton):
(WebCore::HIDGamepadAxis::HIDGamepadAxis):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadcpp">trunk/Source/WebCore/platform/mac/HIDGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadh">trunk/Source/WebCore/platform/mac/HIDGamepad.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170550 => 170551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-27 20:47:05 UTC (rev 170550)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 20:53:14 UTC (rev 170551)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-27 Brady Eidson <beidson@apple.com>
+
+ HIDGamepads should populate themselves with initial input values
+ https://bugs.webkit.org/show_bug.cgi?id=134381
+
+ Reviewed by Darin Adler.
+
+ No new tests (Not yet a tested config)
+
+ * platform/mac/HIDGamepad.cpp:
+ (WebCore::HIDGamepad::getCurrentValueForElement):
+ (WebCore::HIDGamepad::initElements): Loop through all the saved elements to get current values.
+ (WebCore::HIDGamepad::maybeAddButton):
+ (WebCore::HIDGamepad::maybeAddAxis):
+ * platform/mac/HIDGamepad.h:
+ (WebCore::HIDGamepadElement::HIDGamepadElement):
+ (WebCore::HIDGamepadButton::HIDGamepadButton):
+ (WebCore::HIDGamepadAxis::HIDGamepadAxis):
+
</ins><span class="cx"> 2014-06-27 Peyton Randolph <prandolph@apple.com>
</span><span class="cx">
</span><span class="cx"> Add feature flag for link long-press gesture.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepad.cpp (170550 => 170551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepad.cpp 2014-06-27 20:47:05 UTC (rev 170550)
+++ trunk/Source/WebCore/platform/mac/HIDGamepad.cpp 2014-06-27 20:53:14 UTC (rev 170551)
</span><span class="lines">@@ -59,6 +59,14 @@
</span><span class="cx"> initElements();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HIDGamepad::getCurrentValueForElement(const HIDGamepadElement& gamepadElement)
+{
+ IOHIDElementRef element = gamepadElement.iohidElement.get();
+ IOHIDValueRef value;
+ if (IOHIDDeviceGetValue(IOHIDElementGetDevice(element), element, &value) == kIOReturnSuccess)
+ valueChanged(value);
+}
+
</ins><span class="cx"> void HIDGamepad::initElements()
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFArrayRef> elements = adoptCF(IOHIDDeviceCopyMatchingElements(m_hidDevice.get(), NULL, kIOHIDOptionsTypeNone));
</span><span class="lines">@@ -71,6 +79,12 @@
</span><span class="cx">
</span><span class="cx"> m_axisValues.resize(m_axes.size());
</span><span class="cx"> m_buttonValues.resize(m_buttons.size());
</span><ins>+
+ for (auto& button : m_buttons)
+ getCurrentValueForElement(*button);
+
+ for (auto& axis : m_axes)
+ getCurrentValueForElement(*axis);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HIDGamepad::initElementsFromArray(CFArrayRef elements)
</span><span class="lines">@@ -113,7 +127,7 @@
</span><span class="cx"> CFIndex min = IOHIDElementGetLogicalMin(element);
</span><span class="cx"> CFIndex max = IOHIDElementGetLogicalMax(element);
</span><span class="cx">
</span><del>- m_buttons.append(std::make_unique<HIDGamepadButton>(usage, min, max));
</del><ins>+ m_buttons.append(std::make_unique<HIDGamepadButton>(usage, min, max, element));
</ins><span class="cx">
</span><span class="cx"> IOHIDElementCookie cookie = IOHIDElementGetCookie(element);
</span><span class="cx"> m_elementMap.set(cookie, m_buttons.last().get());
</span><span class="lines">@@ -135,7 +149,7 @@
</span><span class="cx"> CFIndex min = IOHIDElementGetPhysicalMin(element);
</span><span class="cx"> CFIndex max = IOHIDElementGetPhysicalMax(element);
</span><span class="cx">
</span><del>- m_axes.append(std::make_unique<HIDGamepadAxis>(min, max));
</del><ins>+ m_axes.append(std::make_unique<HIDGamepadAxis>(min, max, element));
</ins><span class="cx">
</span><span class="cx"> IOHIDElementCookie cookie = IOHIDElementGetCookie(element);
</span><span class="cx"> m_elementMap.set(cookie, m_axes.last().get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepad.h (170550 => 170551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepad.h 2014-06-27 20:47:05 UTC (rev 170550)
+++ trunk/Source/WebCore/platform/mac/HIDGamepad.h 2014-06-27 20:53:14 UTC (rev 170551)
</span><span class="lines">@@ -36,10 +36,11 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct HIDGamepadElement {
</span><del>- HIDGamepadElement(double theMin, double theMax)
</del><ins>+ HIDGamepadElement(double theMin, double theMax, IOHIDElementRef element)
</ins><span class="cx"> : min(theMin)
</span><span class="cx"> , max(theMax)
</span><span class="cx"> , rawValue(theMin)
</span><ins>+ , iohidElement(element)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -50,6 +51,7 @@
</span><span class="cx"> double min;
</span><span class="cx"> double max;
</span><span class="cx"> double rawValue;
</span><ins>+ RetainPtr<IOHIDElementRef> iohidElement;
</ins><span class="cx">
</span><span class="cx"> virtual bool isButton() const { return false; }
</span><span class="cx"> virtual bool isAxis() const { return false; }
</span><span class="lines">@@ -57,9 +59,9 @@
</span><span class="cx"> virtual double normalizedValue() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct HIDGamepadButton : public HIDGamepadElement {
- HIDGamepadButton(uint32_t thePriority, double min, double max)
- : HIDGamepadElement(min, max)
</del><ins>+struct HIDGamepadButton : HIDGamepadElement {
+ HIDGamepadButton(uint32_t thePriority, double min, double max, IOHIDElementRef element)
+ : HIDGamepadElement(min, max, element)
</ins><span class="cx"> , priority(thePriority)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -75,9 +77,9 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct HIDGamepadAxis : public HIDGamepadElement {
- HIDGamepadAxis(double min, double max)
- : HIDGamepadElement(min, max)
</del><ins>+struct HIDGamepadAxis : HIDGamepadElement {
+ HIDGamepadAxis(double min, double max, IOHIDElementRef element)
+ : HIDGamepadElement(min, max, element)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,6 +110,8 @@
</span><span class="cx"> bool maybeAddButton(IOHIDElementRef);
</span><span class="cx"> bool maybeAddAxis(IOHIDElementRef);
</span><span class="cx">
</span><ins>+ void getCurrentValueForElement(const HIDGamepadElement&);
+
</ins><span class="cx"> RetainPtr<IOHIDDeviceRef> m_hidDevice;
</span><span class="cx">
</span><span class="cx"> HashMap<IOHIDElementCookie, HIDGamepadElement*> m_elementMap;
</span></span></pre>
</div>
</div>
</body>
</html>