Refactored gamepad polling to support dynamic sources

device/gamepad/gamepad_data_fetcher.h

Index: device/gamepad/gamepad_data_fetcher.h
diff --git a/device/gamepad/gamepad_data_fetcher.h b/device/gamepad/gamepad_data_fetcher.h
index 28b3949a41f2325028bc6cfc75d9e55523ec5cac..a067b1daaad54ba124dcce3bae932b4ec25f2e69 100644
--- a/device/gamepad/gamepad_data_fetcher.h
+++ b/device/gamepad/gamepad_data_fetcher.h
@@ -5,57 +5,67 @@
 #ifndef DEVICE_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
 #define DEVICE_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
 
-#include <stdint.h>
-
-#include <limits>
-
-#include "build/build_config.h"
-#include "device/gamepad/gamepad_standard_mappings.h"
-#include "third_party/WebKit/public/platform/WebGamepads.h"
+#include "device/gamepad/gamepad_data_fetcher_manager.h"
+#include "device/gamepad/gamepad_export.h"
+#include "device/gamepad/gamepad_provider.h"
 
 namespace device {
 
-// Abstract interface for imlementing platform- (and test-) specific behaviro
+// Abstract interface for imlementing platform- (and test-) specific behavior
 // for getting the gamepad data.
-class GamepadDataFetcher {
+class DEVICE_GAMEPAD_EXPORT GamepadDataFetcher {
  public:
+  GamepadDataFetcher();

[denniskempin, 2016/07/11 22:44:50]

Since the GamepadDataFetcher is now constructed on a different thread than where
it's being used.. would it make sense to add a thread checker? 

   virtual ~GamepadDataFetcher() {}
-  virtual void GetGamepadData(blink::WebGamepads* pads,
-                              bool devices_changed_hint) = 0;
+  virtual void GetGamepadData(bool devices_changed_hint) = 0;
   virtual void PauseHint(bool paused) {}
 
-#if !defined(OS_ANDROID)
-  struct PadState {
-    // Gamepad data, unmapped.
-    blink::WebGamepad data;
+  virtual GamepadSource source() = 0;
+  GamepadProvider* provider() { return provider_; }
 
-    // Functions to map from device data to standard layout, if available. May
-    // be null if no mapping is available.
-    GamepadStandardMappingFunction mapper;
+  PadState* GetPadState(int source_id) {
+    if (!provider_)
+      return nullptr;
 
-    // Sanitization masks
-    // axis_mask and button_mask are bitfields that represent the reset state of
-    // each input. If a button or axis has ever reported 0 in the past the
-    // corresponding bit will be set to 1.
+    return provider_->GetPadState(source(), source_id);
+  }
 
-    // If we ever increase the max axis count this will need to be updated.
-    static_assert(blink::WebGamepad::axesLengthCap <=
-                      std::numeric_limits<uint32_t>::digits,
-                  "axis_mask is not large enough");
-    uint32_t axis_mask;
+ protected:
+  friend GamepadProvider;
 
-    // If we ever increase the max button count this will need to be updated.
-    static_assert(blink::WebGamepad::buttonsLengthCap <=
-                      std::numeric_limits<uint32_t>::digits,
-                  "button_mask is not large enough");
-    uint32_t button_mask;
-  };
+  // To be called by the GamepadProvider on the polling thread;
+  void InitializeProvider(GamepadProvider* provider);
 
-  void MapAndSanitizeGamepadData(PadState* pad_state, blink::WebGamepad* pad);
+  // This call will happen on the gamepad polling thread. Any initialization
+  // that needs to happen on that thread should be done here, not in the
+  // constructor.
+  virtual void OnAddedToProvider(){};
 
- protected:
-  PadState pad_state_[blink::WebGamepads::itemsLengthCap];
-#endif
+ private:
+  GamepadProvider* provider_;
+};
+
+// Factory class for creating a GamepadDataFetcher. Used by the
+// GamepadDataFetcherManager.
+class DEVICE_GAMEPAD_EXPORT GamepadDataFetcherFactory {
+ public:
+  GamepadDataFetcherFactory();
+  virtual ~GamepadDataFetcherFactory() {}
+  virtual std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() = 0;
+  virtual GamepadSource source() = 0;
+};
+
+// Basic factory implementation for GamepadDataFetchers without a complex
+// constructor.
+template <typename DataFetcherType, GamepadSource DataFetcherSource>
+class GamepadDataFetcherFactoryImpl : public GamepadDataFetcherFactory {
+ public:
+  ~GamepadDataFetcherFactoryImpl() override {}
+  std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override {
+    return std::unique_ptr<GamepadDataFetcher>(new DataFetcherType());
+  }
+  GamepadSource source() override { return DataFetcherSource; }
+  static GamepadSource static_source() { return DataFetcherSource; }
 };
 
 }  // namespace device