Title: [232038] trunk
- Revision
- 232038
- Author
- [email protected]
- Date
- 2018-05-21 17:03:20 -0700 (Mon, 21 May 2018)
Log Message
[WinCairo] Enable WebKit build by default
https://bugs.webkit.org/show_bug.cgi?id=185141
Reviewed by Per Arne Vollan.
.:
* Source/cmake/OptionsWin.cmake: Disable
ENABLE_NETSCAPE_PLUGIN_API unconditionally for WinCairo port
because it builds both WK1 and WK2.
* Source/cmake/OptionsWinCairo.cmake: Turn ENABLE_WEBKIT on by default.
Remove BUILDING_WIN_CAIRO_WEBKIT macro.
Tools:
TestWTF, TestWebCore and TestWebKitLegacy need a dependency to
WebKitForwardingHeaders because config.h includes a header of WK2.
* TestWebKitAPI/PlatformWin.cmake: Make TestWTFLib, TestWebCoreLib and TestWebKitLegacyLib depend on WebKitForwardingHeaders.
* TestWebKitAPI/config.h: Use PLATFORM(WIN_CAIRO) instead of BUILDING_WIN_CAIRO_WEBKIT.
Modified Paths
Diff
Modified: trunk/ChangeLog (232037 => 232038)
--- trunk/ChangeLog 2018-05-21 23:42:21 UTC (rev 232037)
+++ trunk/ChangeLog 2018-05-22 00:03:20 UTC (rev 232038)
@@ -1,3 +1,16 @@
+2018-05-21 Fujii Hironori <[email protected]>
+
+ [WinCairo] Enable WebKit build by default
+ https://bugs.webkit.org/show_bug.cgi?id=185141
+
+ Reviewed by Per Arne Vollan.
+
+ * Source/cmake/OptionsWin.cmake: Disable
+ ENABLE_NETSCAPE_PLUGIN_API unconditionally for WinCairo port
+ because it builds both WK1 and WK2.
+ * Source/cmake/OptionsWinCairo.cmake: Turn ENABLE_WEBKIT on by default.
+ Remove BUILDING_WIN_CAIRO_WEBKIT macro.
+
2018-05-21 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.21.2 release.
Modified: trunk/Source/cmake/OptionsWin.cmake (232037 => 232038)
--- trunk/Source/cmake/OptionsWin.cmake 2018-05-21 23:42:21 UTC (rev 232037)
+++ trunk/Source/cmake/OptionsWin.cmake 2018-05-22 00:03:20 UTC (rev 232038)
@@ -83,9 +83,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
# FIXME: Implement plugin process on Modern WebKit. https://bugs.webkit.org/show_bug.cgi?id=185313
- if (ENABLE_WIN_CAIRO_WEBKIT)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
- endif ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (232037 => 232038)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2018-05-21 23:42:21 UTC (rev 232037)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2018-05-22 00:03:20 UTC (rev 232038)
@@ -2,11 +2,6 @@
include(OptionsWin)
-if (ENABLE_WIN_CAIRO_WEBKIT)
- set(ENABLE_WEBKIT ON)
- add_definitions(-DBUILDING_WIN_CAIRO_WEBKIT=1)
-endif ()
-
find_package(Cairo 1.15.12 REQUIRED)
find_package(CURL 7.60.0 REQUIRED)
find_package(JPEG 1.5.2 REQUIRED)
@@ -34,6 +29,7 @@
SET_AND_EXPOSE_TO_BUILD(USE_MEDIA_FOUNDATION ON)
set(ENABLE_GRAPHICS_CONTEXT_3D ON)
+set(ENABLE_WEBKIT ON)
set(COREFOUNDATION_LIBRARY CFlite)
Modified: trunk/Tools/ChangeLog (232037 => 232038)
--- trunk/Tools/ChangeLog 2018-05-21 23:42:21 UTC (rev 232037)
+++ trunk/Tools/ChangeLog 2018-05-22 00:03:20 UTC (rev 232038)
@@ -1,3 +1,16 @@
+2018-05-21 Fujii Hironori <[email protected]>
+
+ [WinCairo] Enable WebKit build by default
+ https://bugs.webkit.org/show_bug.cgi?id=185141
+
+ Reviewed by Per Arne Vollan.
+
+ TestWTF, TestWebCore and TestWebKitLegacy need a dependency to
+ WebKitForwardingHeaders because config.h includes a header of WK2.
+
+ * TestWebKitAPI/PlatformWin.cmake: Make TestWTFLib, TestWebCoreLib and TestWebKitLegacyLib depend on WebKitForwardingHeaders.
+ * TestWebKitAPI/config.h: Use PLATFORM(WIN_CAIRO) instead of BUILDING_WIN_CAIRO_WEBKIT.
+
2018-05-21 Jer Noble <[email protected]>
Complete fix for enabling modern EME by default
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (232037 => 232038)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2018-05-21 23:42:21 UTC (rev 232037)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2018-05-22 00:03:20 UTC (rev 232038)
@@ -98,6 +98,11 @@
)
endif ()
+set(forwarding_headers_dependencies WebCoreForwardingHeaders PALForwardingHeaders)
+if (ENABLE_WEBKIT)
+ list(APPEND forwarding_headers_dependencies WebKitForwardingHeaders)
+endif ()
+
add_library(TestWTFLib SHARED
${test_main_SOURCES}
${TestWTF_SOURCES}
@@ -104,7 +109,7 @@
)
set_target_properties(TestWTFLib PROPERTIES OUTPUT_NAME "TestWTFLib")
target_link_libraries(TestWTFLib ${test_wtf_LIBRARIES})
-add_dependencies(TestWTFLib WebCoreForwardingHeaders)
+add_dependencies(TestWTFLib ${forwarding_headers_dependencies})
set(test_wtf_LIBRARIES
shlwapi
@@ -118,6 +123,7 @@
target_link_libraries(TestWebCoreLib ${test_webcore_LIBRARIES})
set_target_properties(TestWebCoreLib PROPERTIES OUTPUT_NAME "TestWebCoreLib")
+add_dependencies(TestWebCoreLib ${forwarding_headers_dependencies})
add_executable(TestWebCore
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
@@ -150,6 +156,7 @@
)
target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
+ add_dependencies(TestWebKitLegacyLib ${forwarding_headers_dependencies})
add_executable(TestWebKitLegacy
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
Modified: trunk/Tools/TestWebKitAPI/config.h (232037 => 232038)
--- trunk/Tools/TestWebKitAPI/config.h 2018-05-21 23:42:21 UTC (rev 232037)
+++ trunk/Tools/TestWebKitAPI/config.h 2018-05-22 00:03:20 UTC (rev 232038)
@@ -45,7 +45,7 @@
#include <stdint.h>
-#if !PLATFORM(IOS) && !defined(BUILDING_JSCONLY__) && (!PLATFORM(WIN) || defined(BUILDING_WIN_CAIRO_WEBKIT))
+#if !PLATFORM(IOS) && !defined(BUILDING_JSCONLY__) && (!PLATFORM(WIN) || PLATFORM(WIN_CAIRO))
#include <WebKit/WebKit2_C.h>
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
