<!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>[170869] 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/170869">170869</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-07 18:52:37 -0700 (Mon, 07 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move Gamepad index down into PlatformGamepad.
https://bugs.webkit.org/show_bug.cgi?id=134670

Reviewed by Darin Adler.

PlatformGamepads always have an inherent index anyways.
This will make things easier in all upcoming work.

* Modules/gamepad/Gamepad.cpp:
(WebCore::Gamepad::Gamepad):
* Modules/gamepad/Gamepad.h:

* Modules/gamepad/GamepadManager.cpp:
(WebCore::GamepadManager::platformGamepadConnected):
(WebCore::GamepadManager::platformGamepadDisconnected):
(WebCore::GamepadManager::makeGamepadsVisibileToBlindNavigators):
* Modules/gamepad/GamepadManager.h:

* Modules/gamepad/NavigatorGamepad.cpp:
(WebCore::NavigatorGamepad::gamepadsBecameVisible):
(WebCore::NavigatorGamepad::gamepadConnected):
(WebCore::NavigatorGamepad::gamepadDisconnected):
* Modules/gamepad/NavigatorGamepad.h:

* platform/GamepadProviderClient.h:

* platform/PlatformGamepad.h:
(WebCore::PlatformGamepad::index):
(WebCore::PlatformGamepad::PlatformGamepad):

* platform/mac/HIDGamepad.cpp:
(WebCore::HIDGamepad::HIDGamepad):
* platform/mac/HIDGamepad.h:

* platform/mac/HIDGamepadProvider.cpp:
(WebCore::HIDGamepadProvider::deviceAdded):
(WebCore::HIDGamepadProvider::deviceRemoved):
(WebCore::HIDGamepadProvider::removeGamepadForDevice):
* platform/mac/HIDGamepadProvider.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadcpp">trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadh">trunk/Source/WebCore/Modules/gamepad/Gamepad.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagercpp">trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagerh">trunk/Source/WebCore/Modules/gamepad/GamepadManager.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadh">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h</a></li>
<li><a href="#trunkSourceWebCoreplatformGamepadProviderClienth">trunk/Source/WebCore/platform/GamepadProviderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformGamepadh">trunk/Source/WebCore/platform/PlatformGamepad.h</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>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProvidercpp">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProviderh">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/ChangeLog        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-07-07  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Move Gamepad index down into PlatformGamepad.
+        https://bugs.webkit.org/show_bug.cgi?id=134670
+
+        Reviewed by Darin Adler.
+
+        PlatformGamepads always have an inherent index anyways.
+        This will make things easier in all upcoming work.
+
+        * Modules/gamepad/Gamepad.cpp:
+        (WebCore::Gamepad::Gamepad):
+        * Modules/gamepad/Gamepad.h:
+
+        * Modules/gamepad/GamepadManager.cpp:
+        (WebCore::GamepadManager::platformGamepadConnected):
+        (WebCore::GamepadManager::platformGamepadDisconnected):
+        (WebCore::GamepadManager::makeGamepadsVisibileToBlindNavigators):
+        * Modules/gamepad/GamepadManager.h:
+
+        * Modules/gamepad/NavigatorGamepad.cpp:
+        (WebCore::NavigatorGamepad::gamepadsBecameVisible):
+        (WebCore::NavigatorGamepad::gamepadConnected):
+        (WebCore::NavigatorGamepad::gamepadDisconnected):
+        * Modules/gamepad/NavigatorGamepad.h:
+
+        * platform/GamepadProviderClient.h:
+
+        * platform/PlatformGamepad.h:
+        (WebCore::PlatformGamepad::index):
+        (WebCore::PlatformGamepad::PlatformGamepad):
+
+        * platform/mac/HIDGamepad.cpp:
+        (WebCore::HIDGamepad::HIDGamepad):
+        * platform/mac/HIDGamepad.h:
+
+        * platform/mac/HIDGamepadProvider.cpp:
+        (WebCore::HIDGamepadProvider::deviceAdded):
+        (WebCore::HIDGamepadProvider::deviceRemoved):
+        (WebCore::HIDGamepadProvider::removeGamepadForDevice):
+        * platform/mac/HIDGamepadProvider.h:
+
</ins><span class="cx"> 2014-07-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [UI-side compositing] Support reflections on custom layers like video
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-Gamepad::Gamepad(const PlatformGamepad&amp; platformGamepad, unsigned index)
</del><ins>+Gamepad::Gamepad(const PlatformGamepad&amp; platformGamepad)
</ins><span class="cx">     : m_id(platformGamepad.id())
</span><del>-    , m_index(index)
</del><ins>+    , m_index(platformGamepad.index())
</ins><span class="cx">     , m_connected(true)
</span><span class="cx">     , m_timestamp(platformGamepad.lastUpdateTime())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/Gamepad.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/Gamepad.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/Modules/gamepad/Gamepad.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx"> 
</span><span class="cx"> class Gamepad: public RefCounted&lt;Gamepad&gt; {
</span><span class="cx"> public:
</span><del>-    static PassRefPtr&lt;Gamepad&gt; create(const PlatformGamepad&amp; platformGamepad, unsigned index)
</del><ins>+    static PassRefPtr&lt;Gamepad&gt; create(const PlatformGamepad&amp; platformGamepad)
</ins><span class="cx">     {
</span><del>-        return adoptRef(new Gamepad(platformGamepad, index));
</del><ins>+        return adoptRef(new Gamepad(platformGamepad));
</ins><span class="cx">     }
</span><span class="cx">     ~Gamepad();
</span><span class="cx"> 
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">     void updateFromPlatformGamepad(const PlatformGamepad&amp;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    Gamepad(const PlatformGamepad&amp;, unsigned index);
</del><ins>+    explicit Gamepad(const PlatformGamepad&amp;);
</ins><span class="cx">     String m_id;
</span><span class="cx">     unsigned m_index;
</span><span class="cx">     bool m_connected;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx">     GamepadProvider::shared().stopMonitoringGamepads(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GamepadManager::platformGamepadConnected(unsigned index)
</del><ins>+void GamepadManager::platformGamepadConnected(PlatformGamepad&amp; platformGamepad)
</ins><span class="cx"> {
</span><span class="cx">     for (auto&amp; navigator : m_navigators) {
</span><span class="cx">         if (!m_gamepadBlindNavigators.contains(navigator))
</span><del>-            navigator-&gt;gamepadConnected(index);
</del><ins>+            navigator-&gt;gamepadConnected(platformGamepad);
</ins><span class="cx"> 
</span><span class="cx">         // FIXME: Fire connected event to all pages with listeners.
</span><span class="cx">     }
</span><span class="lines">@@ -58,11 +58,11 @@
</span><span class="cx">     makeGamepadsVisibileToBlindNavigators();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GamepadManager::platformGamepadDisconnected(unsigned index)
</del><ins>+void GamepadManager::platformGamepadDisconnected(PlatformGamepad&amp; platformGamepad)
</ins><span class="cx"> {
</span><span class="cx">     for (auto&amp; navigator : m_navigators) {
</span><span class="cx">         if (!m_gamepadBlindNavigators.contains(navigator))
</span><del>-            navigator-&gt;gamepadDisconnected(index);
</del><ins>+            navigator-&gt;gamepadDisconnected(platformGamepad);
</ins><span class="cx"> 
</span><span class="cx">         // FIXME: Fire disconnected event to all pages with listeners.
</span><span class="cx">     }
</span><span class="lines">@@ -78,11 +78,9 @@
</span><span class="cx">     for (auto&amp; navigator : m_gamepadBlindNavigators) {
</span><span class="cx">         // FIXME: Here we notify a blind Navigator of each existing gamepad.
</span><span class="cx">         // But we also need to fire the connected event to its corresponding DOMWindow objects.
</span><del>-        auto&amp; platformGamepads = GamepadProvider::shared().platformGamepads();
-        unsigned size = platformGamepads.size();
-        for (unsigned i = 0; i &lt; size; ++i) {
-            if (platformGamepads[i])
-                navigator-&gt;gamepadConnected(i);
</del><ins>+        for (auto&amp; platformGamepad : GamepadProvider::shared().platformGamepads()) {
+            if (platformGamepad)
+                navigator-&gt;gamepadConnected(*platformGamepad);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> public:
</span><span class="cx">     static GamepadManager&amp; shared();
</span><span class="cx"> 
</span><del>-    virtual void platformGamepadConnected(unsigned index) override final;
-    virtual void platformGamepadDisconnected(unsigned index) override final;
</del><ins>+    virtual void platformGamepadConnected(PlatformGamepad&amp;) override final;
+    virtual void platformGamepadDisconnected(PlatformGamepad&amp;) override final;
</ins><span class="cx">     virtual void platformGamepadInputActivity() override final;
</span><span class="cx"> 
</span><span class="cx">     void registerNavigator(NavigatorGamepad*);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -106,11 +106,11 @@
</span><span class="cx">         if (!platformGamepads[i])
</span><span class="cx">             continue;
</span><span class="cx"> 
</span><del>-        m_gamepads[i] = Gamepad::create(*platformGamepads[i], i);
</del><ins>+        m_gamepads[i] = Gamepad::create(*platformGamepads[i]);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NavigatorGamepad::gamepadConnected(unsigned index)
</del><ins>+void NavigatorGamepad::gamepadConnected(PlatformGamepad&amp; platformGamepad)
</ins><span class="cx"> {
</span><span class="cx">     // If this is the first gamepad this Navigator object has seen, then all gamepads just became visible.
</span><span class="cx">     if (m_gamepads.isEmpty()) {
</span><span class="lines">@@ -118,29 +118,28 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    unsigned index = platformGamepad.index();
+    ASSERT(GamepadProvider::shared().platformGamepads()[index] == &amp;platformGamepad);
+
</ins><span class="cx">     // The new index should already fit in the existing array, or should be exactly one past-the-end of the existing array.
</span><span class="cx">     ASSERT(index &lt;= m_gamepads.size());
</span><span class="cx"> 
</span><del>-    const Vector&lt;PlatformGamepad*&gt;&amp; platformGamepads = GamepadProvider::shared().platformGamepads();
-    ASSERT(index &lt; platformGamepads.size());
-    ASSERT(platformGamepads[index]);
-
</del><span class="cx">     if (index &lt; m_gamepads.size())
</span><del>-        m_gamepads[index] = Gamepad::create(*platformGamepads[index], index);
</del><ins>+        m_gamepads[index] = Gamepad::create(platformGamepad);
</ins><span class="cx">     else if (index == m_gamepads.size())
</span><del>-        m_gamepads.append(Gamepad::create(*platformGamepads[index], index));
</del><ins>+        m_gamepads.append(Gamepad::create(platformGamepad));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NavigatorGamepad::gamepadDisconnected(unsigned index)
</del><ins>+void NavigatorGamepad::gamepadDisconnected(PlatformGamepad&amp; platformGamepad)
</ins><span class="cx"> {
</span><span class="cx">     // If this Navigator hasn't seen any gamepads yet its Vector will still be empty.
</span><span class="cx">     if (!m_gamepads.size())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    ASSERT(index &lt; m_gamepads.size());
-    ASSERT(m_gamepads[index]);
</del><ins>+    ASSERT(platformGamepad.index() &lt; m_gamepads.size());
+    ASSERT(m_gamepads[platformGamepad.index()]);
</ins><span class="cx"> 
</span><del>-    m_gamepads[index] = nullptr;
</del><ins>+    m_gamepads[platformGamepad.index()] = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> class Gamepad;
</span><span class="cx"> class Navigator;
</span><ins>+class PlatformGamepad;
</ins><span class="cx"> 
</span><span class="cx"> class NavigatorGamepad : public Supplement&lt;Navigator&gt; {
</span><span class="cx"> public:
</span><span class="lines">@@ -49,8 +50,8 @@
</span><span class="cx"> 
</span><span class="cx">     double navigationStart() const { return m_navigationStart; }
</span><span class="cx"> 
</span><del>-    void gamepadConnected(unsigned index);
-    void gamepadDisconnected(unsigned index);
</del><ins>+    void gamepadConnected(PlatformGamepad&amp;);
+    void gamepadDisconnected(PlatformGamepad&amp;);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     static const char* supplementName();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformGamepadProviderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GamepadProviderClient.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GamepadProviderClient.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/platform/GamepadProviderClient.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -30,12 +30,14 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+class PlatformGamepad;
+
</ins><span class="cx"> class GamepadProviderClient {
</span><span class="cx"> public:
</span><span class="cx">     virtual ~GamepadProviderClient() { }
</span><span class="cx"> 
</span><del>-    virtual void platformGamepadConnected(unsigned index) = 0;
-    virtual void platformGamepadDisconnected(unsigned index) = 0;
</del><ins>+    virtual void platformGamepadConnected(PlatformGamepad&amp;) = 0;
+    virtual void platformGamepadDisconnected(PlatformGamepad&amp;) = 0;
</ins><span class="cx">     virtual void platformGamepadInputActivity() = 0;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformGamepad.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformGamepad.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/platform/PlatformGamepad.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -38,19 +38,22 @@
</span><span class="cx">     virtual ~PlatformGamepad() { }
</span><span class="cx"> 
</span><span class="cx">     const String&amp; id() const { return m_id; }
</span><ins>+    unsigned index() const { return m_index; }
</ins><span class="cx">     double lastUpdateTime() const { return m_lastUpdateTime; }
</span><span class="cx">     double connectTime() const { return m_connectTime; }
</span><span class="cx">     virtual const Vector&lt;double&gt;&amp; axisValues() const = 0;
</span><span class="cx">     virtual const Vector&lt;double&gt;&amp; buttonValues() const = 0;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    PlatformGamepad()
-        : m_lastUpdateTime(0.0)
</del><ins>+    explicit PlatformGamepad(unsigned index)
+        : m_index(index)
+        , m_lastUpdateTime(0.0)
</ins><span class="cx">         , m_connectTime(0.0)
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     String m_id;
</span><ins>+    unsigned m_index;
</ins><span class="cx">     double m_lastUpdateTime;
</span><span class="cx">     double m_connectTime;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepad.cpp (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepad.cpp        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/platform/mac/HIDGamepad.cpp        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -37,8 +37,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-HIDGamepad::HIDGamepad(IOHIDDeviceRef hidDevice)
-    : m_hidDevice(hidDevice)
</del><ins>+HIDGamepad::HIDGamepad(IOHIDDeviceRef hidDevice, unsigned index)
+    : PlatformGamepad(index)
+    , m_hidDevice(hidDevice)
</ins><span class="cx"> {
</span><span class="cx">     m_connectTime = m_lastUpdateTime = monotonicallyIncreasingTime();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepad.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepad.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/platform/mac/HIDGamepad.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> 
</span><span class="cx"> class HIDGamepad : public PlatformGamepad {
</span><span class="cx"> public:
</span><del>-    HIDGamepad(IOHIDDeviceRef);
</del><ins>+    HIDGamepad(IOHIDDeviceRef, unsigned index);
</ins><span class="cx"> 
</span><span class="cx">     IOHIDDeviceRef hidDevice() const { return m_hidDevice.get(); }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> 
</span><span class="cx">     LOG(Gamepad, &quot;HIDGamepadProvider device %p added&quot;, device);
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;HIDGamepad&gt; gamepad = std::make_unique&lt;HIDGamepad&gt;(device);
</del><span class="cx">     unsigned index = indexForNewlyConnectedDevice();
</span><ins>+    std::unique_ptr&lt;HIDGamepad&gt; gamepad = std::make_unique&lt;HIDGamepad&gt;(device, index);
</ins><span class="cx"> 
</span><span class="cx">     if (m_gamepadVector.size() &lt;= index)
</span><span class="cx">         m_gamepadVector.resize(index + 1);
</span><span class="lines">@@ -192,22 +192,22 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     for (auto&amp; client : m_clients)
</span><del>-        client-&gt;platformGamepadConnected(index);
</del><ins>+        client-&gt;platformGamepadConnected(*m_gamepadVector[index]);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HIDGamepadProvider::deviceRemoved(IOHIDDeviceRef device)
</span><span class="cx"> {
</span><span class="cx">     LOG(Gamepad, &quot;HIDGamepadProvider device %p removed&quot;, device);
</span><span class="cx"> 
</span><del>-    std::pair&lt;std::unique_ptr&lt;HIDGamepad&gt;, unsigned&gt; removedGamepad = removeGamepadForDevice(device);
-    ASSERT(removedGamepad.first);
</del><ins>+    std::unique_ptr&lt;HIDGamepad&gt; removedGamepad = removeGamepadForDevice(device);
+    ASSERT(removedGamepad);
</ins><span class="cx"> 
</span><span class="cx">     // Any time we get a device removed callback we know it's a real event and not an 'already connected' event.
</span><span class="cx">     // We should always stop supressing callbacks when we receive such an event.
</span><span class="cx">     m_shouldDispatchCallbacks = true;
</span><span class="cx"> 
</span><span class="cx">     for (auto&amp; client : m_clients)
</span><del>-        client-&gt;platformGamepadDisconnected(removedGamepad.second);
</del><ins>+        client-&gt;platformGamepadDisconnected(*removedGamepad);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HIDGamepadProvider::valuesChanged(IOHIDValueRef value)
</span><span class="lines">@@ -237,19 +237,14 @@
</span><span class="cx">         client-&gt;platformGamepadInputActivity();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-std::pair&lt;std::unique_ptr&lt;HIDGamepad&gt;, unsigned&gt;  HIDGamepadProvider::removeGamepadForDevice(IOHIDDeviceRef device)
</del><ins>+std::unique_ptr&lt;HIDGamepad&gt; HIDGamepadProvider::removeGamepadForDevice(IOHIDDeviceRef device)
</ins><span class="cx"> {
</span><del>-    std::pair&lt;std::unique_ptr&lt;HIDGamepad&gt;, unsigned&gt; result;
-    result.first = m_gamepadMap.take(device);
-    ASSERT(result.first);
</del><ins>+    std::unique_ptr&lt;HIDGamepad&gt; result = m_gamepadMap.take(device);
+    ASSERT(result);
</ins><span class="cx"> 
</span><del>-    for (unsigned i = 0; i &lt; m_gamepadVector.size(); ++i) {
-        if (m_gamepadVector[i] == result.first.get()) {
-            result.second = i;
-            m_gamepadVector[i] = nullptr;
-            break;
-        }
-    }
</del><ins>+    auto i = m_gamepadVector.find(result.get());
+    if (i != notFound)
+        m_gamepadVector[i] = nullptr;
</ins><span class="cx"> 
</span><span class="cx">     return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h (170868 => 170869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h        2014-07-08 01:38:35 UTC (rev 170868)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h        2014-07-08 01:52:37 UTC (rev 170869)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> private:
</span><span class="cx">     HIDGamepadProvider();
</span><span class="cx"> 
</span><del>-    std::pair&lt;std::unique_ptr&lt;HIDGamepad&gt;, unsigned&gt; removeGamepadForDevice(IOHIDDeviceRef);
</del><ins>+    std::unique_ptr&lt;HIDGamepad&gt; removeGamepadForDevice(IOHIDDeviceRef);
</ins><span class="cx"> 
</span><span class="cx">     void openAndScheduleManager();
</span><span class="cx">     void closeAndUnscheduleManager();
</span></span></pre>
</div>
</div>

</body>
</html>