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

Unified Diff: Source/modules/gamepad/Gamepad.h

Issue 195993007: Factor out GamepadCommon base class from Gamepad and WebKitGamepad (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Tweak Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/modules/gamepad/Gamepad.cpp » ('j') | Source/modules/gamepad/GamepadList.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/gamepad/Gamepad.h
diff --git a/Source/modules/gamepad/Gamepad.h b/Source/modules/gamepad/Gamepad.h
index 1787b1f83d5f63f9f51d3b66a44da924078f5a65..893d4f68220bcdff62c8d7d77907ed843bcc35fe 100644
--- a/Source/modules/gamepad/Gamepad.h
+++ b/Source/modules/gamepad/Gamepad.h
@@ -29,54 +29,27 @@
#include "bindings/v8/ScriptWrappable.h"
#include "heap/Handle.h"
#include "modules/gamepad/GamepadButton.h"
+#include "modules/gamepad/GamepadCommon.h"
#include "public/platform/WebGamepad.h"
#include "wtf/RefCounted.h"
-#include "wtf/Vector.h"
-#include "wtf/text/WTFString.h"
namespace WebCore {
-class Gamepad FINAL : public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public ScriptWrappable {
+class Gamepad FINAL : public GamepadCommon, public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public ScriptWrappable {
kouhei (in TOK) 2014/03/13 09:05:11 RefCountedWillBeGarbageCollectedFinalized must be
Nils Barth (inactive) 2014/03/13 09:15:14 Thanks, got it, done!
public:
static PassRefPtrWillBeRawPtr<Gamepad> create()
{
return adoptRefWillBeNoop(new Gamepad);
}
- ~Gamepad();
-
- typedef Vector<float> FloatVector;
-
- const String& id() const { return m_id; }
- void setId(const String& id) { m_id = id; }
-
- unsigned index() const { return m_index; }
- void setIndex(unsigned val) { m_index = val; }
-
- bool connected() const { return m_connected; }
- void setConnected(bool val) { m_connected = val; }
-
- unsigned long long timestamp() const { return m_timestamp; }
- void setTimestamp(unsigned long long val) { m_timestamp = val; }
-
- const String& mapping() const { return m_mapping; }
- void setMapping(const String& val) { m_mapping = val; }
-
- const FloatVector& axes() const { return m_axes; }
- void setAxes(unsigned count, const float* data);
+ ~Gamepad() { }
const GamepadButtonVector& buttons() const { return m_buttons; }
void setButtons(unsigned count, const blink::WebGamepadButton* data);
- void trace(Visitor*);
+ void trace(Visitor* visitor) { visitor->trace(m_buttons); }
kouhei (in TOK) 2014/03/13 09:05:11 write this in cpp file.
Nils Barth (inactive) 2014/03/13 09:15:14 ok; is there a rule about this? (When to inline?)
kouhei (in TOK) 2014/03/13 09:17:10 IIRC the oilpan rule for trace() was write in cpp
Nils Barth (inactive) 2014/03/13 09:19:52 Thanks for explaining!
private:
- Gamepad();
- String m_id;
- unsigned m_index;
- bool m_connected;
- unsigned long long m_timestamp;
- String m_mapping;
- FloatVector m_axes;
+ Gamepad() { ScriptWrappable::init(this); }
GamepadButtonVector m_buttons;
};
« no previous file with comments | « no previous file | Source/modules/gamepad/Gamepad.cpp » ('j') | Source/modules/gamepad/GamepadList.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698