| 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 20 matching lines...) Expand all Loading... |
| 31 GamepadCommon::GamepadCommon() | 31 GamepadCommon::GamepadCommon() |
| 32 : m_index(0) | 32 : m_index(0) |
| 33 , m_timestamp(0) | 33 , m_timestamp(0) |
| 34 { | 34 { |
| 35 } | 35 } |
| 36 | 36 |
| 37 GamepadCommon::~GamepadCommon() | 37 GamepadCommon::~GamepadCommon() |
| 38 { | 38 { |
| 39 } | 39 } |
| 40 | 40 |
| 41 void GamepadCommon::setAxes(unsigned count, const float* data) | 41 #if defined(ENABLE_NEW_GAMEPAD_API) |
| 42 void GamepadCommon::setAxes(unsigned count, const double* data) |
| 42 { | 43 { |
| 43 m_axes.resize(count); | 44 m_axes.resize(count); |
| 44 if (count) | 45 if (count) |
| 45 std::copy(data, data + count, m_axes.begin()); | 46 std::copy(data, data + count, m_axes.begin()); |
| 46 } | 47 } |
| 48 #else |
| 49 void GamepadCommon::setAxes(unsigned count, const float* data) |
| 50 { |
| 51 m_axes.resize(count); |
| 52 for (unsigned i = 0; i < count; ++i) |
| 53 m_axes[i] = data[i]; |
| 54 } |
| 55 #endif |
| 47 | 56 |
| 48 } // namespace WebCore | 57 } // namespace WebCore |
| OLD | NEW |