Title: [291061] trunk/Source/WebKit
- Revision
- 291061
- Author
- [email protected]
- Date
- 2022-03-09 12:44:41 -0800 (Wed, 09 Mar 2022)
Log Message
[CMake] Associate platform specific configuration with WinCairo
https://bugs.webkit.org/show_bug.cgi?id=237668
Reviewed by Basuke Suzuki.
Move all cairo and curl platform configuration under a check for WinCairo. This arranges
platform config in a consistent manner.
* PlatformWin.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (291060 => 291061)
--- trunk/Source/WebKit/ChangeLog 2022-03-09 20:29:54 UTC (rev 291060)
+++ trunk/Source/WebKit/ChangeLog 2022-03-09 20:44:41 UTC (rev 291061)
@@ -1,3 +1,15 @@
+2022-03-09 Don Olmstead <[email protected]>
+
+ [CMake] Associate platform specific configuration with WinCairo
+ https://bugs.webkit.org/show_bug.cgi?id=237668
+
+ Reviewed by Basuke Suzuki.
+
+ Move all cairo and curl platform configuration under a check for WinCairo. This arranges
+ platform config in a consistent manner.
+
+ * PlatformWin.cmake:
+
2022-03-09 Sihui Liu <[email protected]>
File System Access: disallows names that are not permitted by underlying file system
Modified: trunk/Source/WebKit/PlatformWin.cmake (291060 => 291061)
--- trunk/Source/WebKit/PlatformWin.cmake 2022-03-09 20:29:54 UTC (rev 291060)
+++ trunk/Source/WebKit/PlatformWin.cmake 2022-03-09 20:44:41 UTC (rev 291061)
@@ -25,8 +25,6 @@
NetworkProcess/WebStorage/StorageManager.cpp
- NetworkProcess/curl/NetworkProcessMainCurl.cpp
-
Platform/IPC/win/AttachmentWin.cpp
Platform/IPC/win/ConnectionWin.cpp
Platform/IPC/win/IPCSemaphoreWin.cpp
@@ -37,8 +35,6 @@
Platform/win/ModuleWin.cpp
Platform/win/SharedMemoryWin.cpp
- Shared/API/c/curl/WKCertificateInfoCurl.cpp
-
Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
Shared/win/AuxiliaryProcessMainWin.cpp
@@ -58,9 +54,6 @@
UIProcess/API/C/WKViewportAttributes.cpp
- UIProcess/API/C/curl/WKProtectionSpaceCurl.cpp
- UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp
-
UIProcess/API/C/win/WKView.cpp
UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
@@ -70,8 +63,6 @@
UIProcess/Launcher/win/ProcessLauncherWin.cpp
- UIProcess/WebsiteData/curl/WebsiteDataStoreCurl.cpp
-
UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
UIProcess/wc/DrawingAreaProxyWC.cpp
@@ -124,8 +115,6 @@
"${WEBKIT_DIR}/Shared/Plugins/win"
"${WEBKIT_DIR}/Shared/wc"
"${WEBKIT_DIR}/Shared/win"
- "${WEBKIT_DIR}/UIProcess/API/C/cairo"
- "${WEBKIT_DIR}/UIProcess/API/C/curl"
"${WEBKIT_DIR}/UIProcess/API/C/win"
"${WEBKIT_DIR}/UIProcess/API/cpp/win"
"${WEBKIT_DIR}/UIProcess/API/win"
@@ -166,8 +155,6 @@
)
if (${WTF_PLATFORM_WIN_CAIRO})
- add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
-
list(APPEND WebKit_SOURCES
NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
@@ -176,16 +163,24 @@
NetworkProcess/curl/NetworkDataTaskCurl.cpp
NetworkProcess/curl/NetworkProcessCurl.cpp
+ NetworkProcess/curl/NetworkProcessMainCurl.cpp
NetworkProcess/curl/NetworkSessionCurl.cpp
Shared/API/c/cairo/WKImageCairo.cpp
+ Shared/API/c/curl/WKCertificateInfoCurl.cpp
+
Shared/cairo/ShareableBitmapCairo.cpp
Shared/curl/WebCoreArgumentCodersCurl.cpp
+ UIProcess/API/C/curl/WKProtectionSpaceCurl.cpp
+ UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp
+
UIProcess/Automation/cairo/WebAutomationSessionCairo.cpp
+ UIProcess/WebsiteData/curl/WebsiteDataStoreCurl.cpp
+
UIProcess/cairo/BackingStoreCairo.cpp
WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp
@@ -193,6 +188,8 @@
list(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/NetworkProcess/curl"
+ "${WEBKIT_DIR}/UIProcess/API/C/cairo"
+ "${WEBKIT_DIR}/UIProcess/API/C/curl"
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/curl"
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
