Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1242)

Unified Diff: content/browser/gamepad/gamepad_platform_data_fetcher_win.h

Issue 1586663006: Refactoring gamepad polling to support dynamically added sources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/gamepad/gamepad_platform_data_fetcher_win.h
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h b/content/browser/gamepad/gamepad_platform_data_fetcher_win.h
index f1efab3440bd6098d36d8b4710e24a19c591ba24..b98c9fc258882973edf903114d619849a484f992 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.h
@@ -24,7 +24,6 @@
#include "base/scoped_native_library.h"
#include "content/browser/gamepad/gamepad_data_fetcher.h"
#include "content/browser/gamepad/gamepad_standard_mappings.h"
-#include "content/browser/gamepad/raw_input_data_fetcher_win.h"
#include "third_party/WebKit/public/platform/WebGamepads.h"
namespace content {
@@ -33,14 +32,10 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
public:
GamepadPlatformDataFetcherWin();
~GamepadPlatformDataFetcherWin() override;
- void GetGamepadData(blink::WebGamepads* pads,
- bool devices_changed_hint) override;
- void PauseHint(bool paused) override;
+ void GetGamepadData(bool devices_changed_hint) override;
private:
- // XInput-specific implementation for GetGamepadData.
- bool GetXInputGamepadData(blink::WebGamepads* pads,
- bool devices_changed_hint);
+ void OnAddedToProvider() override;
// The three function types we use from xinput1_3.dll.
typedef void (WINAPI *XInputEnableFunc)(BOOL enable);
@@ -57,14 +52,7 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
// Scan for connected XInput and DirectInput gamepads.
void EnumerateDevices();
- bool GetXInputPadConnectivity(int i, blink::WebGamepad* pad) const;
-
- void GetXInputPadData(int i, blink::WebGamepad* pad);
- void GetRawInputPadData(int i, blink::WebGamepad* pad);
-
- int FirstAvailableGamepadId() const;
- bool HasXInputGamepad(int index) const;
- bool HasRawInputGamepad(const HANDLE handle) const;
+ void GetXInputPadData(int i);
base::ScopedNativeLibrary xinput_dll_;
bool xinput_available_;
@@ -75,21 +63,7 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
XInputGetCapabilitiesFunc xinput_get_capabilities_;
XInputGetStateFunc xinput_get_state_;
- enum PadConnectionStatus {
- DISCONNECTED,
- XINPUT_CONNECTED,
- RAWINPUT_CONNECTED
- };
-
- struct PlatformPadState {
- PadConnectionStatus status;
-
- int xinput_index; // XInput-only
- HANDLE raw_input_handle; // RawInput-only fields.
- };
- PlatformPadState platform_pad_state_[blink::WebGamepads::itemsLengthCap];
-
- scoped_ptr<RawInputDataFetcher> raw_input_fetcher_;
+ bool xinuput_connected_[XUSER_MAX_COUNT];
scottmg 2016/01/18 22:54:51 xinuput -> xinput
DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherWin);
};

Powered by Google App Engine
This is Rietveld 408576698