| Index: Source/modules/gamepad/NavigatorGamepad.cpp
|
| diff --git a/Source/modules/gamepad/NavigatorGamepad.cpp b/Source/modules/gamepad/NavigatorGamepad.cpp
|
| index 5cad270d8bac96c0f58b97c2d77eafe09c88f7d0..a6627256e2ed276552551bd68c2ecfe8c020ccf2 100644
|
| --- a/Source/modules/gamepad/NavigatorGamepad.cpp
|
| +++ b/Source/modules/gamepad/NavigatorGamepad.cpp
|
| @@ -40,7 +40,7 @@
|
| namespace blink {
|
|
|
| template<typename T>
|
| -static void sampleGamepad(unsigned index, T& gamepad, const blink::WebGamepad& webGamepad)
|
| +static void sampleGamepad(unsigned index, T& gamepad, const WebGamepad& webGamepad)
|
| {
|
| gamepad.setId(webGamepad.id);
|
| gamepad.setIndex(index);
|
| @@ -54,12 +54,12 @@ static void sampleGamepad(unsigned index, T& gamepad, const blink::WebGamepad& w
|
| template<typename GamepadType, typename ListType>
|
| static void sampleGamepads(ListType* into)
|
| {
|
| - blink::WebGamepads gamepads;
|
| + WebGamepads gamepads;
|
|
|
| GamepadDispatcher::instance().sampleGamepads(gamepads);
|
|
|
| - for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
|
| - blink::WebGamepad& webGamepad = gamepads.items[i];
|
| + for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
|
| + WebGamepad& webGamepad = gamepads.items[i];
|
| if (i < gamepads.length && webGamepad.connected) {
|
| GamepadType* gamepad = into->item(i);
|
| if (!gamepad)
|
| @@ -271,7 +271,7 @@ void NavigatorGamepad::pageVisibilityChanged()
|
| GamepadList* newGamepads = m_gamepads.get();
|
| ASSERT(newGamepads);
|
|
|
| - for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
|
| + for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
|
| Gamepad* oldGamepad = oldGamepads ? oldGamepads->item(i) : 0;
|
| Gamepad* newGamepad = newGamepads->item(i);
|
| bool oldWasConnected = oldGamepad && oldGamepad->connected();
|
|
|