| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, Google Inc. All rights reserved. | 2 * Copyright (C) 2011, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are met: | 5 * modification, are permitted provided that the following conditions are met: |
| 6 * | 6 * |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 #include "core/frame/Navigator.h" | 29 #include "core/frame/Navigator.h" |
| 30 #include "modules/gamepad/GamepadList.h" | 30 #include "modules/gamepad/GamepadList.h" |
| 31 #include "public/platform/Platform.h" | 31 #include "public/platform/Platform.h" |
| 32 #include "wtf/PassOwnPtr.h" | 32 #include "wtf/PassOwnPtr.h" |
| 33 | 33 |
| 34 namespace WebCore { | 34 namespace WebCore { |
| 35 | 35 |
| 36 static void sampleGamepads(GamepadList* into) | 36 static void sampleGamepads(GamepadList* into) |
| 37 { | 37 { |
| 38 WebKit::WebGamepads gamepads; | 38 blink::WebGamepads gamepads; |
| 39 | 39 |
| 40 WebKit::Platform::current()->sampleGamepads(gamepads); | 40 blink::Platform::current()->sampleGamepads(gamepads); |
| 41 | 41 |
| 42 for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) { | 42 for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) { |
| 43 WebKit::WebGamepad& webGamepad = gamepads.items[i]; | 43 blink::WebGamepad& webGamepad = gamepads.items[i]; |
| 44 if (i < gamepads.length && webGamepad.connected) { | 44 if (i < gamepads.length && webGamepad.connected) { |
| 45 RefPtr<Gamepad> gamepad = into->item(i); | 45 RefPtr<Gamepad> gamepad = into->item(i); |
| 46 if (!gamepad) | 46 if (!gamepad) |
| 47 gamepad = Gamepad::create(); | 47 gamepad = Gamepad::create(); |
| 48 gamepad->id(webGamepad.id); | 48 gamepad->id(webGamepad.id); |
| 49 gamepad->index(i); | 49 gamepad->index(i); |
| 50 gamepad->timestamp(webGamepad.timestamp); | 50 gamepad->timestamp(webGamepad.timestamp); |
| 51 gamepad->axes(webGamepad.axesLength, webGamepad.axes); | 51 gamepad->axes(webGamepad.axesLength, webGamepad.axes); |
| 52 gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons); | 52 gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons); |
| 53 into->set(i, gamepad); | 53 into->set(i, gamepad); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 87 |
| 88 GamepadList* NavigatorGamepad::gamepads() | 88 GamepadList* NavigatorGamepad::gamepads() |
| 89 { | 89 { |
| 90 if (!m_gamepads) | 90 if (!m_gamepads) |
| 91 m_gamepads = GamepadList::create(); | 91 m_gamepads = GamepadList::create(); |
| 92 sampleGamepads(m_gamepads.get()); | 92 sampleGamepads(m_gamepads.get()); |
| 93 return m_gamepads.get(); | 93 return m_gamepads.get(); |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace WebCore | 96 } // namespace WebCore |
| OLD | NEW |