Title: [263912] trunk/Source/WebCore
- Revision
- 263912
- Author
- [email protected]
- Date
- 2020-07-03 14:50:58 -0700 (Fri, 03 Jul 2020)
Log Message
WebCore/Sources.txt: Remove #if ENABLE_LEGACY_ENCRYPTED_MEDIA
https://bugs.webkit.org/show_bug.cgi?id=213937
Reviewed by Sam Weinig.
* CMakeLists.txt: Move IDL-related ENABLE_LEGACY_ENCRYPTED_MEDIA items out of if blocks.
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_LEGACY_ENCRYPTED_MEDIA 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 (263911 => 263912)
--- trunk/Source/WebCore/CMakeLists.txt 2020-07-03 21:45:28 UTC (rev 263911)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-07-03 21:50:58 UTC (rev 263912)
@@ -1308,16 +1308,17 @@
list(APPEND WebCoreTestSupport_SOURCES
testing/LegacyMockCDM.cpp
)
- list(APPEND WebCore_IDL_FILES
- Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl
- Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl
- Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl
- Modules/encryptedmedia/legacy/WebKitMediaKeys.idl
-
- html/WebKitMediaKeyError.idl
- )
endif ()
+list(APPEND WebCore_IDL_FILES
+ Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl
+ Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl
+ Modules/encryptedmedia/legacy/WebKitMediaKeySession.idl
+ Modules/encryptedmedia/legacy/WebKitMediaKeys.idl
+
+ html/WebKitMediaKeyError.idl
+)
+
if (ENABLE_ENCRYPTED_MEDIA)
list(APPEND WebCore_SOURCES
Modules/encryptedmedia/CDM.cpp
Modified: trunk/Source/WebCore/ChangeLog (263911 => 263912)
--- trunk/Source/WebCore/ChangeLog 2020-07-03 21:45:28 UTC (rev 263911)
+++ trunk/Source/WebCore/ChangeLog 2020-07-03 21:50:58 UTC (rev 263912)
@@ -1,5 +1,21 @@
2020-07-03 Darin Adler <[email protected]>
+ WebCore/Sources.txt: Remove #if ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=213937
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt: Move IDL-related ENABLE_LEGACY_ENCRYPTED_MEDIA items out of if blocks.
+ 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_LEGACY_ENCRYPTED_MEDIA 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_QUOTA
https://bugs.webkit.org/show_bug.cgi?id=213941
Modified: trunk/Source/WebCore/Sources.txt (263911 => 263912)
--- trunk/Source/WebCore/Sources.txt 2020-07-03 21:45:28 UTC (rev 263911)
+++ trunk/Source/WebCore/Sources.txt 2020-07-03 21:50:58 UTC (rev 263912)
@@ -3598,6 +3598,11 @@
JSWebKitAudioContext.cpp
JSWebKitAudioPannerNode.cpp
JSWebKitCSSMatrix.cpp
+JSWebKitMediaKeyError.cpp
+JSWebKitMediaKeyMessageEvent.cpp
+JSWebKitMediaKeyNeededEvent.cpp
+JSWebKitMediaKeySession.cpp
+JSWebKitMediaKeys.cpp
JSWebKitOfflineAudioContext.cpp
JSWebKitPlaybackTargetAvailabilityEvent.cpp
JSWebKitPoint.cpp
@@ -3666,16 +3671,6 @@
#endif
-#if ENABLE_LEGACY_ENCRYPTED_MEDIA
-
-JSWebKitMediaKeyMessageEvent.cpp
-JSWebKitMediaKeyNeededEvent.cpp
-JSWebKitMediaKeySession.cpp
-JSWebKitMediaKeys.cpp
-JSWebKitMediaKeyError.cpp
-
-#endif
-
#if ENABLE_ENCRYPTED_MEDIA
JSMediaKeyEncryptionScheme.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
