Share Gamepad and WebKitGamepad implementation

Source/modules/gamepad/Gamepad.cpp

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 
 namespace WebCore {
 
 Gamepad::Gamepad()
     : m_index(0)
     , m_timestamp(0)
 {
     ScriptWrappable::init(this);
 }
 
-void Gamepad::axes(unsigned count, float* data)
+void Gamepad::setAxes(unsigned count, const float* data)
 {
     m_axes.resize(count);
     if (count)
         std::copy(data, data + count, m_axes.begin());
 }
 
-#if defined(ENABLE_NEW_GAMEPAD_API)
-void Gamepad::buttons(unsigned count, blink::WebGamepadButton* data)
+void Gamepad::setButtons(unsigned count, const blink::WebGamepadButton* data)
 {
-    m_buttons.resize(count);
+    if (m_buttons.size() != count) {
+        m_buttons.resize(count);
+        for (unsigned i = 0; i < count; ++i)
+            m_buttons[i] = GamepadButton::create();
+    }
+    for (unsigned i = 0; i < count; ++i) {

[eseidel, 2014/03/12 20:06:46]

I'm not sure if it's simpler to do the copying into the old buttons array on the
setter or the getter.  One could also use a dirty-bit if we did it on the
getter.  Just depends on how often set vs. get is called I gues.  I doubt either
matters much.

[Nils Barth (inactive), 2014/03/13 08:55:46]

(This is from upstream; as noted, doesn't make much difference;
I'm guessing getter called more than setter, hence that's the simple one.)

+        m_buttons[i]->setValue(data[i].value);
+        m_buttons[i]->setPressed(data[i].pressed);
+    }
+}
+
+void Gamepad::setWebkitButtons(unsigned count, const blink::WebGamepadButton* data)
+{
+    m_webkitButtons.resize(count);
     for (unsigned i = 0; i < count; ++i)
-        m_buttons[i] = data[i].value;
+        m_webkitButtons[i] = data[i].value;
 }
-#else
-void Gamepad::buttons(unsigned count, float* data)
+
+void Gamepad::trace(Visitor* visitor)
 {
-    m_buttons.resize(count);
-    if (count)
-        std::copy(data, data + count, m_buttons.begin());
+    visitor->trace(m_buttons);
 }
-#endif
 
 Gamepad::~Gamepad()
 {
 }
 
-void Gamepad::trace(Visitor* visitor)
-{
-}
-
 } // namespace WebCore