Title: [263913] trunk/Source/WebCore
- Revision
- 263913
- Author
- [email protected]
- Date
- 2020-07-03 15:17:45 -0700 (Fri, 03 Jul 2020)
Log Message
WebCore/Sources.txt: Remove #if ENABLE_ENCRYPTED_MEDIA
https://bugs.webkit.org/show_bug.cgi?id=213939
Reviewed by Sam Weinig.
* CMakeLists.txt: Move IDL-related ENABLE_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/ChangeLog (263912 => 263913)
--- trunk/Source/WebCore/ChangeLog 2020-07-03 21:50:58 UTC (rev 263912)
+++ trunk/Source/WebCore/ChangeLog 2020-07-03 22:17:45 UTC (rev 263913)
@@ -1,5 +1,21 @@
2020-07-03 Darin Adler <[email protected]>
+ WebCore/Sources.txt: Remove #if ENABLE_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=213939
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt: Move IDL-related ENABLE_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_LEGACY_ENCRYPTED_MEDIA
https://bugs.webkit.org/show_bug.cgi?id=213937
Modified: trunk/Source/WebCore/Sources.txt (263912 => 263913)
--- trunk/Source/WebCore/Sources.txt 2020-07-03 21:50:58 UTC (rev 263912)
+++ trunk/Source/WebCore/Sources.txt 2020-07-03 22:17:45 UTC (rev 263913)
@@ -3152,6 +3152,7 @@
JSKeyframeEffectOptions.cpp
JSLocation.cpp
JSLongRange.cpp
+JSMediaEncryptedEvent.cpp
JSMediaCapabilities.cpp
JSMediaCapabilitiesDecodingInfo.cpp
JSMediaCapabilitiesEncodingInfo.cpp
@@ -3166,6 +3167,16 @@
JSMediaEncodingConfiguration.cpp
JSMediaEncodingType.cpp
JSMediaError.cpp
+JSMediaKeyEncryptionScheme.cpp
+JSMediaKeyMessageEvent.cpp
+JSMediaKeySession.cpp
+JSMediaKeySessionType.cpp
+JSMediaKeyStatusMap.cpp
+JSMediaKeySystemAccess.cpp
+JSMediaKeySystemConfiguration.cpp
+JSMediaKeySystemMediaCapability.cpp
+JSMediaKeys.cpp
+JSMediaKeysRequirement.cpp
JSMediaList.cpp
JSMediaQueryList.cpp
JSMediaQueryListEvent.cpp
@@ -3196,6 +3207,7 @@
JSNavigatorBeacon.cpp
JSNavigatorClipboard.cpp
JSNavigatorCredentials.cpp
+JSNavigatorEME.cpp
JSNavigatorGeolocation.cpp
JSNavigatorGPU.cpp
JSNavigatorGamepad.cpp
@@ -3671,24 +3683,6 @@
#endif
-#if ENABLE_ENCRYPTED_MEDIA
-
-JSMediaKeyEncryptionScheme.cpp
-JSMediaKeyMessageEvent.cpp
-JSMediaKeySession.cpp
-JSMediaKeySessionType.cpp
-JSMediaKeyStatusMap.cpp
-JSMediaKeySystemAccess.cpp
-JSMediaKeySystemConfiguration.cpp
-JSMediaKeySystemMediaCapability.cpp
-JSMediaKeys.cpp
-JSMediaKeysRequirement.cpp
-JSNavigatorEME.cpp
-
-JSMediaEncryptedEvent.cpp
-
-#endif
-
#if ENABLE_WEBGL
JSANGLEInstancedArrays.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
