Title: [263918] trunk/Source/WebCore
Revision
263918
Author
[email protected]
Date
2020-07-03 16:56:31 -0700 (Fri, 03 Jul 2020)

Log Message

WebCore/Sources.txt: Remove #if ENABLE_WIRELESS_PLAYBACK_TARGET
https://bugs.webkit.org/show_bug.cgi?id=213945

Reviewed by Sam Weinig.

* CMakeLists.txt: Moved items from the pictureinpicture and remoteplayback module here
from PlatformMac.cmake. Even if these are currently only implemented on Mac, they are
not intrinsically Mac-specific, so they belong here.
* PlatformMac.cmake: Ditto.

* Sources.txt: Remove #if ENABLE_WIRELESS_PLAYBACK_TARGET and sort files in with the others.
The source 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 (263917 => 263918)


--- trunk/Source/WebCore/CMakeLists.txt	2020-07-03 23:51:47 UTC (rev 263917)
+++ trunk/Source/WebCore/CMakeLists.txt	2020-07-03 23:56:31 UTC (rev 263918)
@@ -50,8 +50,10 @@
     "${WEBCORE_DIR}/Modules/navigatorcontentutils"
     "${WEBCORE_DIR}/Modules/notifications"
     "${WEBCORE_DIR}/Modules/paymentrequest"
+    "${WEBCORE_DIR}/Modules/pictureinpicture"
     "${WEBCORE_DIR}/Modules/plugins"
     "${WEBCORE_DIR}/Modules/quota"
+    "${WEBCORE_DIR}/Modules/remoteplayback"
     "${WEBCORE_DIR}/Modules/speech"
     "${WEBCORE_DIR}/Modules/streams"
     "${WEBCORE_DIR}/Modules/webaudio"
@@ -410,6 +412,9 @@
     Modules/pictureinpicture/HTMLVideoElementPictureInPicture.idl
     Modules/pictureinpicture/PictureInPictureWindow.idl
 
+    Modules/remoteplayback/RemotePlayback.idl
+    Modules/remoteplayback/RemotePlaybackAvailabilityCallback.idl
+
     Modules/speech/DOMWindowSpeechSynthesis.idl
     Modules/speech/SpeechSynthesis.idl
     Modules/speech/SpeechSynthesisEvent.idl

Modified: trunk/Source/WebCore/ChangeLog (263917 => 263918)


--- trunk/Source/WebCore/ChangeLog	2020-07-03 23:51:47 UTC (rev 263917)
+++ trunk/Source/WebCore/ChangeLog	2020-07-03 23:56:31 UTC (rev 263918)
@@ -1,3 +1,19 @@
+2020-07-03  Darin Adler  <[email protected]>
+
+        WebCore/Sources.txt: Remove #if ENABLE_WIRELESS_PLAYBACK_TARGET
+        https://bugs.webkit.org/show_bug.cgi?id=213945
+
+        Reviewed by Sam Weinig.
+
+        * CMakeLists.txt: Moved items from the pictureinpicture and remoteplayback module here
+        from PlatformMac.cmake. Even if these are currently only implemented on Mac, they are
+        not intrinsically Mac-specific, so they belong here.
+        * PlatformMac.cmake: Ditto.
+
+        * Sources.txt: Remove #if ENABLE_WIRELESS_PLAYBACK_TARGET and sort files in with the others.
+        The source 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  Sam Weinig  <[email protected]>
 
         Remove support for ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE

Modified: trunk/Source/WebCore/PlatformMac.cmake (263917 => 263918)


--- trunk/Source/WebCore/PlatformMac.cmake	2020-07-03 23:51:47 UTC (rev 263917)
+++ trunk/Source/WebCore/PlatformMac.cmake	2020-07-03 23:56:31 UTC (rev 263918)
@@ -72,8 +72,6 @@
 endif ()
 
 list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
-    "${WEBCORE_DIR}/Modules/pictureinpicture"
-    "${WEBCORE_DIR}/Modules/remoteplayback"
     "${WEBCORE_DIR}/Modules/webauthn/apdu"
     "${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal"
     "${WEBCORE_DIR}/accessibility/isolatedtree/mac"
@@ -659,9 +657,6 @@
     Modules/applepay/paymentrequest/ApplePayRequest.idl
 
     Modules/plugins/QuickTimePluginReplacement.idl
-
-    Modules/remoteplayback/RemotePlayback.idl
-    Modules/remoteplayback/RemotePlaybackAvailabilityCallback.idl
 )
 
 set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")

Modified: trunk/Source/WebCore/Sources.txt (263917 => 263918)


--- trunk/Source/WebCore/Sources.txt	2020-07-03 23:51:47 UTC (rev 263917)
+++ trunk/Source/WebCore/Sources.txt	2020-07-03 23:56:31 UTC (rev 263918)
@@ -3345,6 +3345,8 @@
 JSReadableStreamSink.cpp
 JSReadableStreamSource.cpp
 JSRemoteDOMWindow.cpp
+JSRemotePlayback.cpp
+JSRemotePlaybackAvailabilityCallback.cpp
 JSRequestAnimationFrameCallback.cpp
 JSResizeObserver.cpp
 JSResizeObserverCallback.cpp
@@ -3751,10 +3753,3 @@
 JSVTTRegionList.cpp
 JSVideoTrack.cpp
 JSVideoTrackList.cpp
-
-#if ENABLE_WIRELESS_PLAYBACK_TARGET
-
-JSRemotePlayback.cpp
-JSRemotePlaybackAvailabilityCallback.cpp
-
-#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to