Title: [263910] trunk/Source/WebCore
- Revision
- 263910
- Author
- [email protected]
- Date
- 2020-07-03 14:43:59 -0700 (Fri, 03 Jul 2020)
Log Message
WebCore/Sources.txt: Remove #if ENABLE_GAMEPAD
https://bugs.webkit.org/show_bug.cgi?id=213936
Reviewed by Sam Weinig.
* CMakeLists.txt: Move IDL-related ENABLE_GAMEPAD items out of "if (ENABLE_GAMEPAD)".
Longer term, I think our direction should be to remove most feature conditionals from
CMakeLists.txt too, just like I am doing for Sources.txt. But for now, doing just enough
of this to keep the build working. Someone can tidy this later as desired.
* Sources.txt: Remove #if ENABLE_GAMEPAD and sort files in with the others.
The IDL files themselves have conditionals, we don't need conditionals in Sources.txt,
and we are moving towards removing the capability for #if ENABLE in the Sources.txt file.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (263909 => 263910)
--- trunk/Source/WebCore/CMakeLists.txt 2020-07-03 21:40:55 UTC (rev 263909)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-07-03 21:43:59 UTC (rev 263910)
@@ -1180,22 +1180,22 @@
svg/SVGZoomEvent.idl
)
-if (ENABLE_GAMEPAD)
- list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/Modules/gamepad"
- )
+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/gamepad"
+)
- list(APPEND WebCore_IDL_INCLUDES
- Modules/gamepad
- )
+list(APPEND WebCore_IDL_INCLUDES
+ Modules/gamepad
+)
- list(APPEND WebCore_NON_SVG_IDL_FILES
- Modules/gamepad/Gamepad.idl
- Modules/gamepad/GamepadButton.idl
- Modules/gamepad/GamepadEvent.idl
- Modules/gamepad/NavigatorGamepad.idl
- )
+list(APPEND WebCore_NON_SVG_IDL_FILES
+ Modules/gamepad/Gamepad.idl
+ Modules/gamepad/GamepadButton.idl
+ Modules/gamepad/GamepadEvent.idl
+ Modules/gamepad/NavigatorGamepad.idl
+)
+if (ENABLE_GAMEPAD)
list(APPEND WebCore_SOURCES
Modules/gamepad/Gamepad.cpp
Modules/gamepad/GamepadButton.cpp
Modified: trunk/Source/WebCore/ChangeLog (263909 => 263910)
--- trunk/Source/WebCore/ChangeLog 2020-07-03 21:40:55 UTC (rev 263909)
+++ trunk/Source/WebCore/ChangeLog 2020-07-03 21:43:59 UTC (rev 263910)
@@ -1,5 +1,21 @@
2020-07-03 Darin Adler <[email protected]>
+ WebCore/Sources.txt: Remove #if ENABLE_GAMEPAD
+ https://bugs.webkit.org/show_bug.cgi?id=213936
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt: Move IDL-related ENABLE_GAMEPAD items out of "if (ENABLE_GAMEPAD)".
+ Longer term, I think our direction should be to remove most feature conditionals from
+ CMakeLists.txt too, just like I am doing for Sources.txt. But for now, doing just enough
+ of this to keep the build working. Someone can tidy this later as desired.
+
+ * Sources.txt: Remove #if ENABLE_GAMEPAD and sort files in with the others.
+ The IDL files themselves have conditionals, we don't need conditionals in Sources.txt,
+ and we are moving towards removing the capability for #if ENABLE in the Sources.txt file.
+
+2020-07-03 Darin Adler <[email protected]>
+
WebCore/Sources.txt: Remove #if ENABLE_MEDIA_SOURCE
https://bugs.webkit.org/show_bug.cgi?id=213940
Modified: trunk/Source/WebCore/Sources.txt (263909 => 263910)
--- trunk/Source/WebCore/Sources.txt 2020-07-03 21:40:55 UTC (rev 263909)
+++ trunk/Source/WebCore/Sources.txt 2020-07-03 21:43:59 UTC (rev 263910)
@@ -3009,6 +3009,9 @@
JSGPUVertexBufferDescriptor.cpp
JSGPUVertexInputDescriptor.cpp
JSGainNode.cpp
+JSGamepad.cpp
+JSGamepadButton.cpp
+JSGamepadEvent.cpp
JSGeolocation.cpp
JSGeolocationCoordinates.cpp
JSGeolocationPosition.cpp
@@ -3194,6 +3197,7 @@
JSNavigatorCredentials.cpp
JSNavigatorGeolocation.cpp
JSNavigatorGPU.cpp
+JSNavigatorGamepad.cpp
JSNavigatorID.cpp
JSNavigatorLanguage.cpp
JSNavigatorMaxTouchPoints.cpp
@@ -3654,15 +3658,6 @@
#endif
-#if ENABLE_GAMEPAD
-
-JSGamepad.cpp
-JSGamepadButton.cpp
-JSGamepadEvent.cpp
-JSNavigatorGamepad.cpp
-
-#endif
-
#if ENABLE_LEGACY_ENCRYPTED_MEDIA
JSWebKitMediaKeyMessageEvent.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
