| 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 26 matching lines...) Expand all Loading... |
| 37 ScriptWrappable::init(this); | 37 ScriptWrappable::init(this); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void Gamepad::axes(unsigned count, float* data) | 40 void Gamepad::axes(unsigned count, float* data) |
| 41 { | 41 { |
| 42 m_axes.resize(count); | 42 m_axes.resize(count); |
| 43 if (count) | 43 if (count) |
| 44 std::copy(data, data + count, m_axes.begin()); | 44 std::copy(data, data + count, m_axes.begin()); |
| 45 } | 45 } |
| 46 | 46 |
| 47 #if defined(ENABLE_NEW_GAMEPAD_API) |
| 48 void Gamepad::buttons(unsigned count, blink::WebGamepadButton* data) |
| 49 { |
| 50 m_buttons.resize(count); |
| 51 for (unsigned i = 0; i < count; ++i) |
| 52 m_buttons[i] = data[i].value; |
| 53 } |
| 54 #else |
| 47 void Gamepad::buttons(unsigned count, float* data) | 55 void Gamepad::buttons(unsigned count, float* data) |
| 48 { | 56 { |
| 49 m_buttons.resize(count); | 57 m_buttons.resize(count); |
| 50 if (count) | 58 if (count) |
| 51 std::copy(data, data + count, m_buttons.begin()); | 59 std::copy(data, data + count, m_buttons.begin()); |
| 52 } | 60 } |
| 61 #endif |
| 53 | 62 |
| 54 Gamepad::~Gamepad() | 63 Gamepad::~Gamepad() |
| 55 { | 64 { |
| 56 } | 65 } |
| 57 | 66 |
| 58 void Gamepad::trace(Visitor* visitor) | 67 void Gamepad::trace(Visitor* visitor) |
| 59 { | 68 { |
| 60 } | 69 } |
| 61 | 70 |
| 62 } // namespace WebCore | 71 } // namespace WebCore |
| OLD | NEW |