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

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: Add ABC FIXME 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/GamepadList.h » ('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..a79fddd5c2536a7fdab2803de1cb5385e9cb9dfc 100644
--- a/Source/modules/gamepad/Gamepad.h
+++ b/Source/modules/gamepad/Gamepad.h
@@ -36,7 +36,7 @@
namespace WebCore {
-class Gamepad FINAL : public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public ScriptWrappable {
+class Gamepad : public RefCountedWillBeGarbageCollectedFinalized<Gamepad>, public ScriptWrappable {
public:
static PassRefPtrWillBeRawPtr<Gamepad> create()
{
@@ -69,7 +69,8 @@ public:
void trace(Visitor*);
-private:
+protected:
+ // Inherited by WebKitGamepad
Gamepad();
String m_id;
unsigned m_index;
@@ -77,7 +78,9 @@ private:
unsigned long long m_timestamp;
String m_mapping;
FloatVector m_axes;
- GamepadButtonVector m_buttons;
+
+private:
+ GamepadButtonVector m_buttons; // WebKitGamepad.buttons has different type
};
} // namespace WebCore
« no previous file with comments | « no previous file | Source/modules/gamepad/GamepadList.h » ('j') | Source/modules/gamepad/GamepadList.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698