Title: [205470] trunk/Source/WebKit2
- Revision
- 205470
- Author
- [email protected]
- Date
- 2016-09-05 22:57:16 -0700 (Mon, 05 Sep 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (205469 => 205470)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-09-06 04:21:23 UTC (rev 205469)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-09-06 05:57:16 UTC (rev 205470)
@@ -116,6 +116,7 @@
"${WEBCORE_DIR}/platform"
"${WEBCORE_DIR}/platform/animation"
"${WEBCORE_DIR}/platform/audio"
+ "${WEBCORE_DIR}/platform/gamepad"
"${WEBCORE_DIR}/platform/graphics"
"${WEBCORE_DIR}/platform/graphics/filters"
"${WEBCORE_DIR}/platform/graphics/harfbuzz"
@@ -331,6 +332,8 @@
Shared/Databases/IndexedDB/IDBUtilities.cpp
Shared/Databases/IndexedDB/WebIDBResult.cpp
+ Shared/Gamepad/GamepadData.cpp
+
Shared/Plugins/NPIdentifierData.cpp
Shared/Plugins/NPObjectMessageReceiver.cpp
Shared/Plugins/NPObjectProxy.cpp
@@ -484,6 +487,7 @@
UIProcess/Downloads/DownloadProxy.cpp
UIProcess/Downloads/DownloadProxyMap.cpp
+ UIProcess/Gamepad/UIGamepad.cpp
UIProcess/Gamepad/UIGamepadProvider.cpp
UIProcess/InspectorServer/HTTPRequest.cpp
Modified: trunk/Source/WebKit2/ChangeLog (205469 => 205470)
--- trunk/Source/WebKit2/ChangeLog 2016-09-06 04:21:23 UTC (rev 205469)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-06 05:57:16 UTC (rev 205470)
@@ -1,3 +1,23 @@
+2016-09-05 Zan Dobersek <[email protected]>
+
+ 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 <[email protected]>
Remove some dead code in ViewGestureControllerMac
Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp (205469 => 205470)
--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-09-06 04:21:23 UTC (rev 205469)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-09-06 05:57:16 UTC (rev 205470)
@@ -31,8 +31,8 @@
#include "GamepadData.h"
#include "UIGamepad.h"
#include "WebProcessPool.h"
-#include <WebCore/HIDGamepadProvider.h>
#include <WebCore/MockGamepadProvider.h>
+#include <WebCore/PlatformGamepad.h>
#include <wtf/NeverDestroyed.h>
using namespace WebCore;
@@ -230,29 +230,12 @@
// FIXME: Implement for other platforms
}
-void UIGamepadProvider::platformStartMonitoringGamepads()
+WebPageProxy* UIGamepadProvider::platformWebPageProxyForGamepadInput()
{
// FIXME: Implement for other platforms
+ return nullptr;
}
-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
-}
-
void UIGamepadProvider::platformStopMonitoringInput()
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
