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

Side by Side Diff: Source/modules/gamepad/NavigatorGamepad.cpp

Issue 170993002: Updating Blink-side WebGamepad interface (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase 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 | « Source/modules/gamepad/Gamepad.idl ('k') | public/platform/WebGamepad.h » ('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 29 matching lines...) Expand all
40 blink::Platform::current()->sampleGamepads(gamepads); 40 blink::Platform::current()->sampleGamepads(gamepads);
41 41
42 for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) { 42 for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
43 blink::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 RefPtrWillBeRawPtr<Gamepad> gamepad = into->item(i); 45 RefPtrWillBeRawPtr<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->connected(webGamepad.connected);
50 gamepad->timestamp(webGamepad.timestamp); 51 gamepad->timestamp(webGamepad.timestamp);
52 #if defined(ENABLE_NEW_GAMEPAD_API)
53 gamepad->mapping(webGamepad.mapping);
54 #endif
51 gamepad->axes(webGamepad.axesLength, webGamepad.axes); 55 gamepad->axes(webGamepad.axesLength, webGamepad.axes);
52 gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons); 56 gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
53 into->set(i, gamepad); 57 into->set(i, gamepad);
54 } else { 58 } else {
55 into->set(i, 0); 59 into->set(i, 0);
56 } 60 }
57 } 61 }
58 } 62 }
59 63
60 NavigatorGamepad::NavigatorGamepad() 64 NavigatorGamepad::NavigatorGamepad()
(...skipping 26 matching lines...) Expand all
87 91
88 GamepadList* NavigatorGamepad::gamepads() 92 GamepadList* NavigatorGamepad::gamepads()
89 { 93 {
90 if (!m_gamepads) 94 if (!m_gamepads)
91 m_gamepads = GamepadList::create(); 95 m_gamepads = GamepadList::create();
92 sampleGamepads(m_gamepads.get()); 96 sampleGamepads(m_gamepads.get());
93 return m_gamepads.get(); 97 return m_gamepads.get();
94 } 98 }
95 99
96 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/gamepad/Gamepad.idl ('k') | public/platform/WebGamepad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698