Title: [278719] trunk
- Revision
- 278719
- Author
- [email protected]
- Date
- 2021-06-10 12:24:49 -0700 (Thu, 10 Jun 2021)
Log Message
[WPE] Enable Cog for developer builds
https://bugs.webkit.org/show_bug.cgi?id=224360
Patch by Philippe Normand <[email protected]> on 2021-06-10
Reviewed by Adrian Perez de Castro.
.:
Cog would be preferred over MiniBrowser for WPE developer builds because it provides a nicer
user experience, while keeping the same spirit as MiniBrowser. Pass `-DENABLE_COG=NO` to
CMake to disable it and fall back to MiniBrowser.
* Source/cmake/OptionsWPE.cmake:
Tools:
* PlatformWPE.cmake: Enable X11 support in Cog. Re-enable headless support in Cog. Map
libsoup configuration in Cog with the one used by the WebKit build.
Modified Paths
Diff
Modified: trunk/ChangeLog (278718 => 278719)
--- trunk/ChangeLog 2021-06-10 19:08:52 UTC (rev 278718)
+++ trunk/ChangeLog 2021-06-10 19:24:49 UTC (rev 278719)
@@ -1,3 +1,16 @@
+2021-06-10 Philippe Normand <[email protected]>
+
+ [WPE] Enable Cog for developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=224360
+
+ Reviewed by Adrian Perez de Castro.
+
+ Cog would be preferred over MiniBrowser for WPE developer builds because it provides a nicer
+ user experience, while keeping the same spirit as MiniBrowser. Pass `-DENABLE_COG=NO` to
+ CMake to disable it and fall back to MiniBrowser.
+
+ * Source/cmake/OptionsWPE.cmake:
+
2021-06-08 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.33.2 release
Modified: trunk/Source/cmake/OptionsWPE.cmake (278718 => 278719)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-06-10 19:08:52 UTC (rev 278718)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-06-10 19:24:49 UTC (rev 278719)
@@ -95,6 +95,7 @@
if (ENABLE_DEVELOPER_MODE)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_COG PRIVATE ON)
endif ()
if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT EXISTS "/.flatpak-info")
Modified: trunk/Source/cmake/WebKitFeatures.cmake (278718 => 278719)
--- trunk/Source/cmake/WebKitFeatures.cmake 2021-06-10 19:08:52 UTC (rev 278718)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2021-06-10 19:24:49 UTC (rev 278719)
@@ -139,6 +139,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_BUBBLEWRAP_SANDBOX "Toggle Bubblewrap sandboxing support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CACHE_PARTITIONING "Toggle cache partitioning support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle Channel Messaging support" PRIVATE ON)
+ WEBKIT_OPTION_DEFINE(ENABLE_COG "Toggle Cog browser compilation." PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_EXTENSIONS "Toggle Content Extensions support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" PRIVATE ON)
Modified: trunk/Tools/ChangeLog (278718 => 278719)
--- trunk/Tools/ChangeLog 2021-06-10 19:08:52 UTC (rev 278718)
+++ trunk/Tools/ChangeLog 2021-06-10 19:24:49 UTC (rev 278719)
@@ -1,3 +1,13 @@
+2021-06-10 Philippe Normand <[email protected]>
+
+ [WPE] Enable Cog for developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=224360
+
+ Reviewed by Adrian Perez de Castro.
+
+ * PlatformWPE.cmake: Enable X11 support in Cog. Re-enable headless support in Cog. Map
+ libsoup configuration in Cog with the one used by the WebKit build.
+
2021-06-10 Truitt Savell <[email protected]>
Remove Ews179 and bot279 from configs
Modified: trunk/Tools/PlatformWPE.cmake (278718 => 278719)
--- trunk/Tools/PlatformWPE.cmake 2021-06-10 19:08:52 UTC (rev 278718)
+++ trunk/Tools/PlatformWPE.cmake 2021-06-10 19:24:49 UTC (rev 278719)
@@ -31,7 +31,7 @@
GIT_REPOSITORY "${WPE_COG_REPO}"
GIT_TAG "${WPE_COG_TAG}"
SOURCE_DIR "${CMAKE_SOURCE_DIR}/Tools/wpe/cog"
- CMAKE_ARGS "-DCOG_PLATFORM_GTK4=ON"
+ CMAKE_ARGS "-DCOG_PLATFORM_GTK4=ON" "-DCOG_PLATFORM_HEADLESS=ON" "-DCOG_PLATFORM_X11=ON" "-DUSE_SOUP2=${USE_SOUP2}"
INSTALL_COMMAND "")
ExternalProject_Add_StepDependencies(cog build WebKit)
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
