Title: [213787] trunk/Source/WebKit2
Revision
213787
Author
[email protected]
Date
2017-03-13 01:01:16 -0700 (Mon, 13 Mar 2017)

Log Message

[WK2][CMake] Remove the intermediate NetworkProcess_COMMON_SOURCES variable
https://bugs.webkit.org/show_bug.cgi?id=169524

Reviewed by Michael Catanzaro.

The NetworkProcess-specific source files listed in the
NetworkProcess_COMMON_SOURCES variable definition should be directly
inlined into the list with which the WebKit2_SOURCE variable is defined.
The NetworkProcess_COMMON_SOURCES variable is appended to the
WebKit2_SOURCES variable anyway, and is not used anywhere else. The
separate variable was previously use to support configurations that
allowed disabling NetworkProcess.

* CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/CMakeLists.txt (213786 => 213787)


--- trunk/Source/WebKit2/CMakeLists.txt	2017-03-13 07:54:43 UTC (rev 213786)
+++ trunk/Source/WebKit2/CMakeLists.txt	2017-03-13 08:01:16 UTC (rev 213787)
@@ -94,20 +94,27 @@
     )
 endif ()
 
-set(NetworkProcess_COMMON_SOURCES
+set(WebKit2_SOURCES
     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
 
+    NetworkProcess/Downloads/BlobDownloadClient.cpp
+    NetworkProcess/Downloads/Download.cpp
+    NetworkProcess/Downloads/DownloadManager.cpp
+    NetworkProcess/Downloads/PendingDownload.cpp
+
+    NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
+
     NetworkProcess/NetworkConnectionToWebProcess.cpp
     NetworkProcess/NetworkDataTask.cpp
     NetworkProcess/NetworkDataTaskBlob.cpp
     NetworkProcess/NetworkLoad.cpp
     NetworkProcess/NetworkProcess.cpp
+    NetworkProcess/NetworkProcessCreationParameters.cpp
     NetworkProcess/NetworkProcessPlatformStrategies.cpp
+    NetworkProcess/NetworkResourceLoadParameters.cpp
     NetworkProcess/NetworkResourceLoader.cpp
     NetworkProcess/NetworkSession.cpp
 
-    NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
-
     NetworkProcess/cache/NetworkCache.cpp
     NetworkProcess/cache/NetworkCacheBlobStorage.cpp
     NetworkProcess/cache/NetworkCacheCoders.cpp
@@ -127,22 +134,12 @@
     NetworkProcess/capture/NetworkCaptureReplayer.cpp
     NetworkProcess/capture/NetworkCaptureResource.cpp
     NetworkProcess/capture/NetworkDataTaskReplay.cpp
-)
 
-set(WebKit2_SOURCES
     DatabaseProcess/DatabaseProcess.cpp
     DatabaseProcess/DatabaseToWebProcessConnection.cpp
 
     DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp
 
-    NetworkProcess/NetworkProcessCreationParameters.cpp
-    NetworkProcess/NetworkResourceLoadParameters.cpp
-
-    NetworkProcess/Downloads/BlobDownloadClient.cpp
-    NetworkProcess/Downloads/Download.cpp
-    NetworkProcess/Downloads/DownloadManager.cpp
-    NetworkProcess/Downloads/PendingDownload.cpp
-
     Platform/Logging.cpp
     Platform/Module.cpp
 
@@ -585,8 +582,6 @@
     WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp
     WebProcess/WebPage/WebURLSchemeHandlerTaskProxy.cpp
     WebProcess/WebPage/WebUndoStep.cpp
-
-    ${NetworkProcess_COMMON_SOURCES}
 )
 
 set(WebKit2_MESSAGES_IN_FILES

Modified: trunk/Source/WebKit2/ChangeLog (213786 => 213787)


--- trunk/Source/WebKit2/ChangeLog	2017-03-13 07:54:43 UTC (rev 213786)
+++ trunk/Source/WebKit2/ChangeLog	2017-03-13 08:01:16 UTC (rev 213787)
@@ -1,3 +1,20 @@
+2017-03-13  Zan Dobersek  <[email protected]>
+
+        [WK2][CMake] Remove the intermediate NetworkProcess_COMMON_SOURCES variable
+        https://bugs.webkit.org/show_bug.cgi?id=169524
+
+        Reviewed by Michael Catanzaro.
+
+        The NetworkProcess-specific source files listed in the
+        NetworkProcess_COMMON_SOURCES variable definition should be directly
+        inlined into the list with which the WebKit2_SOURCE variable is defined.
+        The NetworkProcess_COMMON_SOURCES variable is appended to the
+        WebKit2_SOURCES variable anyway, and is not used anywhere else. The
+        separate variable was previously use to support configurations that
+        allowed disabling NetworkProcess.
+
+        * CMakeLists.txt:
+
 2017-03-13  Dean Jackson  <[email protected]>
 
         WebGPU remote layer hosting
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to