Changeset 101065 in webkit

Timestamp:

Nov 23, 2011 4:16:13 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Adding gamepad support
​https://bugs.webkit.org/show_bug.cgi?id=69451

Source/WebCore:

Patch by Scott Graham <​scottmg@chromium.org> on 2011-11-23
Reviewed by Darin Fisher.

Plumb gamepad data access through platform.

Test: gamepad/gamepad-polling-access.html

• WebCore.gypi:
• page/Navigator.cpp:

(WebCore::Navigator::webkitGamepads):

• page/Navigator.h:
• platform/Gamepads.h: Added.
• platform/chromium/GamepadsChromium.cpp: Added.

(WebCore::sampleGamepads):

• platform/chromium/PlatformSupport.h:

Source/WebKit/chromium:

Add implementation of sampleGamepads in Chromium platform. Retrieves
gamepad data from Chromium port and converts to DOM format, i.e.
GamepadList.

Patch by Scott Graham <​scottmg@chromium.org> on 2011-11-23
Reviewed by Darin Fisher.

• src/PlatformSupport.cpp:

(WebCore::PlatformSupport::sampleGamepads):

Tools:

Patch by Scott Graham <​scottmg@chromium.org> on 2011-11-23
Reviewed by Darin Fisher.

Add a 'gamepadController' to Chromium DRT. Allows for setting of mock
gamepad data that will be retrieved when JS code pulls via API access.

• DumpRenderTree/DumpRenderTree.gypi:
• DumpRenderTree/chromium/GamepadController.cpp: Added.

(GamepadController::GamepadController):
(GamepadController::bindToJavascript):
(GamepadController::reset):
(GamepadController::connect):
(GamepadController::disconnect):
(GamepadController::setId):
(GamepadController::setButtonCount):
(GamepadController::setButtonData):
(GamepadController::setAxisCount):
(GamepadController::setAxisData):
(GamepadController::fallbackCallback):

• DumpRenderTree/chromium/GamepadController.h: Added.
• DumpRenderTree/chromium/TestShell.cpp:

(TestShell::TestShell):
(TestShell::resetTestController):
(TestShell::bindJSObjectsToWindow):

• DumpRenderTree/chromium/TestShell.h:

(TestShell::gamepadController):

LayoutTests:

Patch by Scott Graham <​scottmg@chromium.org> on 2011-11-23
Reviewed by Darin Fisher.

• fast/dom/script-tests/prototype-inheritance.js: Exclude

gamepadController from enumeration.

• gamepad/gamepad-polling-access-expected.txt: Added.
• gamepad/gamepad-polling-access.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/script-tests/prototype-inheritance.js (modified) (1 diff)
• LayoutTests/gamepad/gamepad-polling-access-expected.txt (added)
• LayoutTests/gamepad/gamepad-polling-access.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (1 diff)
• Source/WebCore/page/Navigator.cpp (modified) (2 diffs)
• Source/WebCore/page/Navigator.h (modified) (1 diff)
• Source/WebCore/platform/Gamepads.h (added)
• Source/WebCore/platform/chromium/GamepadsChromium.cpp (added)
• Source/WebCore/platform/chromium/PlatformSupport.h (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/PlatformSupport.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/DumpRenderTree.gypi (modified) (1 diff)
• Tools/DumpRenderTree/chromium/GamepadController.cpp (added)
• Tools/DumpRenderTree/chromium/GamepadController.h (added)
• Tools/DumpRenderTree/chromium/TestShell.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/chromium/TestShell.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-23  Scott Graham  <scottmg@chromium.org>
+
+        Adding gamepad support
+        https://bugs.webkit.org/show_bug.cgi?id=69451
+
+        Reviewed by Darin Fisher.
+
+        * fast/dom/script-tests/prototype-inheritance.js: Exclude
+        gamepadController from enumeration.
+        * gamepad/gamepad-polling-access-expected.txt: Added.
+        * gamepad/gamepad-polling-access.html: Added.
+
 2011-11-23  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js

@@ -13 +13 @@
     "eventSender", "objCPlugin", "objCPluginFunction",
     "appleScriptController", "plainText", "accessibilityController",
+    "gamepadController",
     "internals",
     // Ignore these properties because they do not exist in all implementations. They will be tested separately

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-23  Scott Graham  <scottmg@chromium.org>
+
+        Adding gamepad support
+        https://bugs.webkit.org/show_bug.cgi?id=69451
+
+        Reviewed by Darin Fisher.
+
+        Plumb gamepad data access through platform.
+
+        Test: gamepad/gamepad-polling-access.html
+
+        * WebCore.gypi:
+        * page/Navigator.cpp:
+        (WebCore::Navigator::webkitGamepads):
+        * page/Navigator.h:
+        * platform/Gamepads.h: Added.
+        * platform/chromium/GamepadsChromium.cpp: Added.
+        (WebCore::sampleGamepads):
+        * platform/chromium/PlatformSupport.h:
+
 2011-11-23  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -3241 +3241 @@
             'platform/chromium/FramelessScrollView.h',
             'platform/chromium/FramelessScrollViewClient.h',
+            'platform/chromium/GamepadsChromium.cpp',
             'platform/chromium/GestureRecognizerChromium.cpp',
             'platform/chromium/GestureRecognizerChromium.h',

trunk/Source/WebCore/page/Navigator.cpp

@@ -48 +48 @@
 #if ENABLE(GAMEPAD)
 #include "GamepadList.h"
+#include "Gamepads.h"
 #endif
 
@@ -312 +313 @@
 GamepadList* Navigator::webkitGamepads()
 {
-    // Stubbed until platform/ changes landed.
-    return 0;
+    if (!m_gamepads)
+        m_gamepads = GamepadList::create();
+    sampleGamepads(m_gamepads.get());
+    return m_gamepads.get();
 }
 #endif

trunk/Source/WebCore/page/Navigator.h

@@ -86 +86 @@
     mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
     mutable RefPtr<Geolocation> m_geolocation;
+#if ENABLE(GAMEPAD)
+    mutable RefPtr<GamepadList> m_gamepads;
+#endif
 #if ENABLE(POINTER_LOCK)
     mutable RefPtr<PointerLock> m_pointer;

trunk/Source/WebCore/platform/chromium/PlatformSupport.h

@@ -72 +72 @@
 class Document;
 class Frame;
+class GamepadList;
 class GeolocationServiceBridge;
 class GeolocationServiceChromium;
@@ -182 +183 @@
     // Injects key via keyPath into value. Returns true on success.
     static PassRefPtr<SerializedScriptValue> injectIDBKeyIntoSerializedValue(PassRefPtr<IDBKey>, PassRefPtr<SerializedScriptValue>, const String& keyPath);
+
+    // Gamepad -----------------------------------------------------------
+    static void sampleGamepads(GamepadList* into);
 
     // JavaScript ---------------------------------------------------------

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-23  Scott Graham  <scottmg@chromium.org>
+
+        Adding gamepad support
+        https://bugs.webkit.org/show_bug.cgi?id=69451
+
+        Add implementation of sampleGamepads in Chromium platform. Retrieves
+        gamepad data from Chromium port and converts to DOM format, i.e.
+        GamepadList.
+
+        Reviewed by Darin Fisher.
+
+        * src/PlatformSupport.cpp:
+        (WebCore::PlatformSupport::sampleGamepads):
+
 2011-11-23  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebKit/chromium/src/PlatformSupport.cpp

@@ -91 +91 @@
 #include "Document.h"
 #include "FrameView.h"
+#include "GamepadList.h"
 #include "GraphicsContext.h"
 #include "IDBFactoryBackendProxy.h"
@@ -525 +526 @@
 {
     return webKitPlatformSupport()->injectIDBKeyIntoSerializedValue(key, value, keyPath);
+}
+
+// Gamepad --------------------------------------------------------------------
+
+void PlatformSupport::sampleGamepads(GamepadList* into)
+{
+    WebGamepads gamepads;
+
+    webKitPlatformSupport()->sampleGamepads(gamepads);
+
+    for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) {
+        WebGamepad& webGamepad = gamepads.items[i];
+        if (i < gamepads.length && webGamepad.connected) {
+            RefPtr<Gamepad> gamepad = into->item(i);
+            if (!gamepad)
+                gamepad = Gamepad::create();
+            gamepad->id(webGamepad.id);
+            gamepad->index(i);
+            gamepad->timestamp(webGamepad.timestamp);
+            gamepad->axes(webGamepad.axesLength, webGamepad.axes);
+            gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
+            into->set(i, gamepad);
+        } else
+            into->set(i, 0);
+    }
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-23  Scott Graham  <scottmg@chromium.org>
+
+        Adding gamepad support
+        https://bugs.webkit.org/show_bug.cgi?id=69451
+
+        Reviewed by Darin Fisher.
+
+        Add a 'gamepadController' to Chromium DRT. Allows for setting of mock
+        gamepad data that will be retrieved when JS code pulls via API access.
+
+        * DumpRenderTree/DumpRenderTree.gypi:
+        * DumpRenderTree/chromium/GamepadController.cpp: Added.
+        (GamepadController::GamepadController):
+        (GamepadController::bindToJavascript):
+        (GamepadController::reset):
+        (GamepadController::connect):
+        (GamepadController::disconnect):
+        (GamepadController::setId):
+        (GamepadController::setButtonCount):
+        (GamepadController::setButtonData):
+        (GamepadController::setAxisCount):
+        (GamepadController::setAxisData):
+        (GamepadController::fallbackCallback):
+        * DumpRenderTree/chromium/GamepadController.h: Added.
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::TestShell):
+        (TestShell::resetTestController):
+        (TestShell::bindJSObjectsToWindow):
+        * DumpRenderTree/chromium/TestShell.h:
+        (TestShell::gamepadController):
+
 2011-11-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

@@ -17 +17 @@
             'chromium/EventSender.cpp',
             'chromium/EventSender.h',
+            'chromium/GamepadController.cpp',
+            'chromium/GamepadController.h',
             'chromium/LayoutTestController.cpp',
             'chromium/LayoutTestController.h',

trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

@@ -128 +128 @@
     m_webPermissions = adoptPtr(new WebPermissions(this));
     m_accessibilityController = adoptPtr(new AccessibilityController(this));
+    m_gamepadController = adoptPtr(new GamepadController(this));
     m_layoutTestController = adoptPtr(new LayoutTestController(this));
     m_eventSender = adoptPtr(new EventSender(this));
@@ -271 +272 @@
     m_webPermissions->reset();
     m_accessibilityController->reset();
+    m_gamepadController->reset();
     m_layoutTestController->reset();
     m_eventSender->reset();
@@ -674 +676 @@
     WebTestingSupport::injectInternalsObject(frame);
     m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
+    m_gamepadController->bindToJavascript(frame, WebString::fromUTF8("gamepadController"));
     m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
     m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));

trunk/Tools/DumpRenderTree/chromium/TestShell.h

@@ -34 +34 @@
 #include "AccessibilityController.h"
 #include "EventSender.h"
+#include "GamepadController.h"
 #include "LayoutTestController.h"
 #include "NotificationPresenter.h"
@@ -92 +93 @@
     EventSender* eventSender() const { return m_eventSender.get(); }
     AccessibilityController* accessibilityController() const { return m_accessibilityController.get(); }
+    GamepadController* gamepadController() const { return m_gamepadController.get(); }
     NotificationPresenter* notificationPresenter() const { return m_notificationPresenter.get(); }
     TestEventPrinter* printer() const { return m_printer.get(); }
@@ -206 +208 @@
     OwnPtr<DRTDevToolsClient> m_drtDevToolsClient;
     OwnPtr<AccessibilityController> m_accessibilityController;
+    OwnPtr<GamepadController> m_gamepadController;
     OwnPtr<EventSender> m_eventSender;
     OwnPtr<LayoutTestController> m_layoutTestController;