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

Side by Side Diff: trunk/Source/modules/gamepad/Gamepad.cpp

Issue 171423019: Revert 167539 "Updating Blink-side Gamepad API to match latest spec" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/Source/modules/gamepad/Gamepad.h ('k') | trunk/Source/modules/gamepad/Gamepad.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 void Gamepad::buttons(unsigned count, blink::WebGamepadButton* data) 47 void Gamepad::buttons(unsigned count, float* data)
48 { 48 {
49 if (m_buttons.size() != count) { 49 m_buttons.resize(count);
50 m_buttons.resize(count); 50 if (count)
51 for (unsigned i = 0; i < count; ++i) 51 std::copy(data, data + count, m_buttons.begin());
52 m_buttons[i] = GamepadButton::create();
53 }
54
55 for (unsigned i = 0; i < count; ++i) {
56 m_buttons[i]->pressed(data[i].pressed);
57 m_buttons[i]->value(data[i].value);
58 }
59 } 52 }
60 53
61 Gamepad::~Gamepad() 54 Gamepad::~Gamepad()
62 { 55 {
63 } 56 }
64 57
65 void Gamepad::trace(Visitor* visitor) 58 void Gamepad::trace(Visitor* visitor)
66 { 59 {
67 } 60 }
68 61
69 } // namespace WebCore 62 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/modules/gamepad/Gamepad.h ('k') | trunk/Source/modules/gamepad/Gamepad.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698