Changeset 205470 in webkit

Timestamp:

Sep 5, 2016 10:57:16 PM (8 years ago)

Author:

zandobersek@gmail.com

Message:

Fix ENABLE(GAMEPAD) build errors on non-Cocoa platforms
​https://bugs.webkit.org/show_bug.cgi?id=161596

Reviewed by Darin Adler.

This patch fixes build errors popping up when enabling Gamepad
feature on non-Cocoa platforms.

• CMakeLists.txt: Add the Source/WebCore/platform/gamepad/ directory to

WebKit2_INCLUDE_DIRECTORIES. Add GamepadData.cpp, UIGamepad.cpp files to the build.

• UIProcess/Gamepad/UIGamepadProvider.cpp: Don't include Cocoa-specific

HIDGamepadProvider.h file. Update methods for the UIGamepadProvider class.
(WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
(WebKit::UIGamepadProvider::platformStartMonitoringGamepads): Deleted.
(WebKit::UIGamepadProvider::platformStopMonitoringGamepads): Deleted.
(WebKit::UIGamepadProvider::platformGamepads): Deleted.
(WebKit::UIGamepadProvider::platformWebProcessProxyForGamepadInput): Deleted.

Location:

trunk/Source/WebKit2

Files:

• CMakeLists.txt (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• UIProcess/Gamepad/UIGamepadProvider.cpp (modified) (2 diffs)

trunk/Source/WebKit2/CMakeLists.txt

@@ -117 +117 @@
     "${WEBCORE_DIR}/platform/animation"
     "${WEBCORE_DIR}/platform/audio"
+    "${WEBCORE_DIR}/platform/gamepad"
     "${WEBCORE_DIR}/platform/graphics"
     "${WEBCORE_DIR}/platform/graphics/filters"
@@ -331 +332 @@
     Shared/Databases/IndexedDB/IDBUtilities.cpp
     Shared/Databases/IndexedDB/WebIDBResult.cpp
+
+    Shared/Gamepad/GamepadData.cpp
 
     Shared/Plugins/NPIdentifierData.cpp
@@ -485 +488 @@
     UIProcess/Downloads/DownloadProxyMap.cpp
 
+    UIProcess/Gamepad/UIGamepad.cpp
     UIProcess/Gamepad/UIGamepadProvider.cpp
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        Fix ENABLE(GAMEPAD) build errors on non-Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=161596
+
+        Reviewed by Darin Adler.
+
+        This patch fixes build errors popping up when enabling Gamepad
+        feature on non-Cocoa platforms.
+
+        * CMakeLists.txt: Add the Source/WebCore/platform/gamepad/ directory to
+        WebKit2_INCLUDE_DIRECTORIES. Add GamepadData.cpp, UIGamepad.cpp files to the build.
+        * UIProcess/Gamepad/UIGamepadProvider.cpp: Don't include Cocoa-specific
+        HIDGamepadProvider.h file. Update methods for the UIGamepadProvider class.
+        (WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
+        (WebKit::UIGamepadProvider::platformStartMonitoringGamepads): Deleted.
+        (WebKit::UIGamepadProvider::platformStopMonitoringGamepads): Deleted.
+        (WebKit::UIGamepadProvider::platformGamepads): Deleted.
+        (WebKit::UIGamepadProvider::platformWebProcessProxyForGamepadInput): Deleted.
+
 2016-09-05  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp

@@ -32 +32 @@
 #include "UIGamepad.h"
 #include "WebProcessPool.h"
-#include <WebCore/HIDGamepadProvider.h>
 #include <WebCore/MockGamepadProvider.h>
+#include <WebCore/PlatformGamepad.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -231 +231 @@
 }
 
-void UIGamepadProvider::platformStartMonitoringGamepads()
+WebPageProxy* UIGamepadProvider::platformWebPageProxyForGamepadInput()
 {
     // FIXME: Implement for other platforms
-}
-
-void UIGamepadProvider::platformStopMonitoringGamepads()
-{
-    // FIXME: Implement for other platforms
-}
-
-const Vector<PlatformGamepad*>& UIGamepadProvider::platformGamepads()
-{
-    static NeverDestroyed<Vector<PlatformGamepad*>> emptyGamepads;
-    return emptyGamepads;
-
-    // FIXME: Implement for other platforms
-}
-
-WebProcessProxy* UIGamepadProvider::platformWebProcessProxyForGamepadInput()
-{
-    // FIXME: Implement for other platforms
+    return nullptr;
 }