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

Side by Side Diff: third_party/WebKit/Source/modules/gamepad/Gamepad.h

Issue 2352713004: Added displayId to Gamepad (Closed)
Patch Set: Re-upstream w/o webvr dependency Created 4 years, 3 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
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 const GamepadButtonVector& buttons() const { return m_buttons; } 68 const GamepadButtonVector& buttons() const { return m_buttons; }
69 void setButtons(unsigned count, const WebGamepadButton* data); 69 void setButtons(unsigned count, const WebGamepadButton* data);
70 70
71 GamepadPose* pose() const { return m_pose; } 71 GamepadPose* pose() const { return m_pose; }
72 void setPose(const WebGamepadPose&); 72 void setPose(const WebGamepadPose&);
73 73
74 const String& hand() const { return m_hand; } 74 const String& hand() const { return m_hand; }
75 void setHand(const WebGamepadHand&); 75 void setHand(const WebGamepadHand&);
76 76
77 unsigned displayId() const { return m_displayId; }
78 void setDisplayId(unsigned val) { m_displayId = val; }
79
77 DECLARE_TRACE(); 80 DECLARE_TRACE();
78 81
79 private: 82 private:
80 Gamepad(); 83 Gamepad();
81 84
82 String m_id; 85 String m_id;
83 unsigned m_index; 86 unsigned m_index;
84 bool m_connected; 87 bool m_connected;
85 unsigned long long m_timestamp; 88 unsigned long long m_timestamp;
86 String m_mapping; 89 String m_mapping;
87 DoubleVector m_axes; 90 DoubleVector m_axes;
88 GamepadButtonVector m_buttons; 91 GamepadButtonVector m_buttons;
89 Member<GamepadPose> m_pose; 92 Member<GamepadPose> m_pose;
90 String m_hand; 93 String m_hand;
94 unsigned m_displayId;
91 }; 95 };
92 96
93 } // namespace blink 97 } // namespace blink
94 98
95 #endif // Gamepad_h 99 #endif // Gamepad_h
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppb_gamepad_shared.h ('k') | third_party/WebKit/Source/modules/gamepad/Gamepad.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698