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

Unified Diff: device/gamepad/gamepad_pad_state_provider.cc

Issue 2808093006: [Device Service] Move Gamepad Blink headers to be part of the Gamepad client library (Closed)
Patch Set: rebase and address comments Created 3 years, 8 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
« no previous file with comments | « device/gamepad/gamepad_pad_state_provider.h ('k') | device/gamepad/gamepad_platform_data_fetcher_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/gamepad/gamepad_pad_state_provider.cc
diff --git a/device/gamepad/gamepad_pad_state_provider.cc b/device/gamepad/gamepad_pad_state_provider.cc
index afc8beb798ef28d2e7301c3065c0f1ff8ae14bf8..8f525cb4d1ed3fe1f98839a08087e552608104d1 100644
--- a/device/gamepad/gamepad_pad_state_provider.cc
+++ b/device/gamepad/gamepad_pad_state_provider.cc
@@ -7,10 +7,7 @@
#include <cmath>
#include "device/gamepad/gamepad_data_fetcher.h"
-#include "third_party/WebKit/public/platform/WebGamepads.h"
-
-using blink::WebGamepad;
-using blink::WebGamepads;
+#include "device/gamepad/public/cpp/gamepads.h"
namespace device {
@@ -21,9 +18,9 @@ const float kMinAxisResetValue = 0.1f;
} // namespace
GamepadPadStateProvider::GamepadPadStateProvider() {
- pad_states_.reset(new PadState[WebGamepads::kItemsLengthCap]);
+ pad_states_.reset(new PadState[Gamepads::kItemsLengthCap]);
- for (unsigned i = 0; i < WebGamepads::kItemsLengthCap; ++i)
+ for (unsigned i = 0; i < Gamepads::kItemsLengthCap; ++i)
ClearPadState(pad_states_.get()[i]);
}
@@ -33,7 +30,7 @@ PadState* GamepadPadStateProvider::GetPadState(GamepadSource source,
int source_id) {
// Check to see if the device already has a reserved slot
PadState* empty_slot = nullptr;
- for (size_t i = 0; i < WebGamepads::kItemsLengthCap; ++i) {
+ for (size_t i = 0; i < Gamepads::kItemsLengthCap; ++i) {
PadState& state = pad_states_.get()[i];
if (state.source == source && state.source_id == source_id) {
// Retrieving the pad state marks this gamepad as active.
@@ -61,13 +58,13 @@ void GamepadPadStateProvider::InitializeDataFetcher(
}
void GamepadPadStateProvider::MapAndSanitizeGamepadData(PadState* pad_state,
- WebGamepad* pad,
+ Gamepad* pad,
bool sanitize) {
DCHECK(pad_state);
DCHECK(pad);
if (!pad_state->data.connected) {
- memset(pad, 0, sizeof(WebGamepad));
+ memset(pad, 0, sizeof(Gamepad));
return;
}
« no previous file with comments | « device/gamepad/gamepad_pad_state_provider.h ('k') | device/gamepad/gamepad_platform_data_fetcher_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698