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

Log Message

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

Reviewed by Sam Weinig.

* CMakeLists.txt: Move IDL-related ENABLE_USER_MESSAGE_HANDLERS 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_USER_MESSAGE_HANDLERS 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 (263914 => 263915)


--- trunk/Source/WebCore/CMakeLists.txt	2020-07-03 23:23:48 UTC (rev 263914)
+++ trunk/Source/WebCore/CMakeLists.txt	2020-07-03 23:25:25 UTC (rev 263915)
@@ -1536,12 +1536,13 @@
     )
 endif ()
 
+list(APPEND WebCore_IDL_FILES
+    page/UserMessageHandler.idl
+    page/UserMessageHandlersNamespace.idl
+    page/WebKitNamespace.idl
+)
+
 if (ENABLE_USER_MESSAGE_HANDLERS)
-    list(APPEND WebCore_IDL_FILES
-        page/UserMessageHandler.idl
-        page/UserMessageHandlersNamespace.idl
-        page/WebKitNamespace.idl
-    )
     list(APPEND WebCore_SOURCES
         page/UserMessageHandler.cpp
         page/UserMessageHandlerDescriptor.cpp

Modified: trunk/Source/WebCore/ChangeLog (263914 => 263915)


--- trunk/Source/WebCore/ChangeLog	2020-07-03 23:23:48 UTC (rev 263914)
+++ trunk/Source/WebCore/ChangeLog	2020-07-03 23:25:25 UTC (rev 263915)
@@ -1,5 +1,21 @@
 2020-07-03  Darin Adler  <[email protected]>
 
+        WebCore/Sources.txt: Remove #if ENABLE_USER_MESSAGE_HANDLERS
+        https://bugs.webkit.org/show_bug.cgi?id=213944
+
+        Reviewed by Sam Weinig.
+
+        * CMakeLists.txt: Move IDL-related ENABLE_USER_MESSAGE_HANDLERS 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_USER_MESSAGE_HANDLERS 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  Darin Adler  <[email protected]>
+
         WebCore/SourcesCocoa.txt: Remove #if ENABLE_APPLE_PAY
         https://bugs.webkit.org/show_bug.cgi?id=213943
 

Modified: trunk/Source/WebCore/Sources.txt (263914 => 263915)


--- trunk/Source/WebCore/Sources.txt	2020-07-03 23:23:48 UTC (rev 263914)
+++ trunk/Source/WebCore/Sources.txt	2020-07-03 23:25:25 UTC (rev 263915)
@@ -3564,6 +3564,8 @@
 JSUIEvent.cpp
 JSUIEventInit.cpp
 JSURLSearchParams.cpp
+JSUserMessageHandler.cpp
+JSUserMessageHandlersNamespace.cpp
 JSUserVerificationRequirement.cpp
 JSValidityState.cpp
 JSVideoConfiguration.cpp
@@ -3615,6 +3617,7 @@
 JSWebKitMediaKeyNeededEvent.cpp
 JSWebKitMediaKeySession.cpp
 JSWebKitMediaKeys.cpp
+JSWebKitNamespace.cpp
 JSWebKitOfflineAudioContext.cpp
 JSWebKitPlaybackTargetAvailabilityEvent.cpp
 JSWebKitPoint.cpp
@@ -3750,14 +3753,6 @@
 JSVideoTrack.cpp
 JSVideoTrackList.cpp
 
-#if ENABLE_USER_MESSAGE_HANDLERS
-
-JSUserMessageHandler.cpp
-JSUserMessageHandlersNamespace.cpp
-JSWebKitNamespace.cpp
-
-#endif
-
 #if ENABLE_WIRELESS_PLAYBACK_TARGET
 
 JSRemotePlayback.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to