Title: [228148] trunk
- Revision
- 228148
- Author
- [email protected]
- Date
- 2018-02-05 18:29:57 -0800 (Mon, 05 Feb 2018)
Log Message
[WinCairo] Refine WebKitLegacy and WebKit build for wincairo
https://bugs.webkit.org/show_bug.cgi?id=182478
Patch by Yousuke Kimoto <[email protected]> on 2018-02-05
Reviewed by Alex Christensen.
.:
* Source/cmake/OptionsWinCairo.cmake: Added a ENABLE_WIN_CAIRO_WEBKIT option to build webkit for wincairo.
Source/WebKit:
Fixed a typo of forwarding header path for InjectedBundle and copying header
method, which should use FLATTENED.
* PlatformWin.cmake: Fix a typo of a forwarding header path for InjectedBundle and use FLATTENED.
Tools:
For TestWebKitAPI, sources related to WebKitLegacy are built
at WebKit build. Those files should be reffered for WebKitLegacy build.
* TestWebKitAPI/PlatformWin.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (228147 => 228148)
--- trunk/ChangeLog 2018-02-06 02:27:50 UTC (rev 228147)
+++ trunk/ChangeLog 2018-02-06 02:29:57 UTC (rev 228148)
@@ -1,3 +1,12 @@
+2018-02-05 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Refine WebKitLegacy and WebKit build for wincairo
+ https://bugs.webkit.org/show_bug.cgi?id=182478
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/OptionsWinCairo.cmake: Added a ENABLE_WIN_CAIRO_WEBKIT option to build webkit for wincairo.
+
2018-02-05 Michael Catanzaro <[email protected]>
Unreviewed, fix build using the new ENABLE_ADDRESS_SANITIZER option
Modified: trunk/Source/WebKit/ChangeLog (228147 => 228148)
--- trunk/Source/WebKit/ChangeLog 2018-02-06 02:27:50 UTC (rev 228147)
+++ trunk/Source/WebKit/ChangeLog 2018-02-06 02:29:57 UTC (rev 228148)
@@ -1,3 +1,15 @@
+2018-02-05 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Refine WebKitLegacy and WebKit build for wincairo
+ https://bugs.webkit.org/show_bug.cgi?id=182478
+
+ Reviewed by Alex Christensen.
+
+ Fixed a typo of forwarding header path for InjectedBundle and copying header
+ method, which should use FLATTENED.
+
+ * PlatformWin.cmake: Fix a typo of a forwarding header path for InjectedBundle and use FLATTENED.
+
2018-02-05 Youenn Fablet <[email protected]>
WebsiteDataStore::resolveDirectoriesIfNecessary() should not overwrite its resolved serviceWorkerRegistrationDirectory if already set
Modified: trunk/Source/WebKit/PlatformWin.cmake (228147 => 228148)
--- trunk/Source/WebKit/PlatformWin.cmake 2018-02-06 02:27:50 UTC (rev 228147)
+++ trunk/Source/WebKit/PlatformWin.cmake 2018-02-06 02:29:57 UTC (rev 228148)
@@ -12,13 +12,13 @@
NetworkProcess/win/NetworkProcessMainWin.cpp
NetworkProcess/win/SystemProxyWin.cpp
+ Platform/IPC/win/AttachmentWin.cpp
+ Platform/IPC/win/ConnectionWin.cpp
+
Platform/win/LoggingWin.cpp
Platform/win/ModuleWin.cpp
Platform/win/SharedMemoryWin.cpp
- Platform/IPC/win/AttachmentWin.cpp
- Platform/IPC/win/ConnectionWin.cpp
-
StorageProcess/win/StorageProcessMainWin.cpp
WebProcess/InjectedBundle/win/InjectedBundleWin.cpp
@@ -160,7 +160,10 @@
WebProcess/WebPage
- WebProcess/InectedBundle/API/c
+ WebProcess/InjectedBundle/API/c
)
-WEBKIT_MAKE_FORWARDING_HEADERS(WebKit DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES})
+WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
+ DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES}
+ FLATTENED
+)
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (228147 => 228148)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2018-02-06 02:27:50 UTC (rev 228147)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2018-02-06 02:29:57 UTC (rev 228148)
@@ -2,6 +2,10 @@
include(OptionsWin)
+if (ENABLE_WIN_CAIRO_WEBKIT)
+ set(ENABLE_WEBKIT ON)
+endif ()
+
find_package(Cairo 1.14.10 REQUIRED)
find_package(CURL 7.56.1 REQUIRED)
find_package(JPEG 1.5.2 REQUIRED)
Modified: trunk/Tools/ChangeLog (228147 => 228148)
--- trunk/Tools/ChangeLog 2018-02-06 02:27:50 UTC (rev 228147)
+++ trunk/Tools/ChangeLog 2018-02-06 02:29:57 UTC (rev 228148)
@@ -1,3 +1,15 @@
+2018-02-05 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Refine WebKitLegacy and WebKit build for wincairo
+ https://bugs.webkit.org/show_bug.cgi?id=182478
+
+ Reviewed by Alex Christensen.
+
+ For TestWebKitAPI, sources related to WebKitLegacy are built
+ at WebKit build. Those files should be reffered for WebKitLegacy build.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
2018-02-05 Daniel Bates <[email protected]>
REGRESSION (r217572): run-webkit-tests exits without emitting newline character
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (228147 => 228148)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2018-02-06 02:27:50 UTC (rev 228147)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2018-02-06 02:29:57 UTC (rev 228148)
@@ -139,27 +139,31 @@
WebKitLegacy${DEBUG_SUFFIX}
gtest
)
-add_library(TestWebKitLegacyLib SHARED
- ${test_main_SOURCES}
- ${TESTWEBKITAPI_DIR}/TestsController.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/ScaleWebView.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/WebViewDestruction.cpp
- ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
-)
-target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
+if (ENABLE_WEBKIT_LEGACY)
+ add_library(TestWebKitLegacyLib SHARED
+ ${test_main_SOURCES}
+ ${TESTWEBKITAPI_DIR}/TestsController.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/ScaleWebView.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/WebViewDestruction.cpp
+ ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
+ )
-add_executable(TestWebKitLegacy
- ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
-)
-target_link_libraries(TestWebKitLegacy shlwapi)
+ target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
-add_test(TestWebKitLegacy ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitLegacy)
-set_tests_properties(TestWebKitLegacy PROPERTIES TIMEOUT 60)
+ add_executable(TestWebKitLegacy
+ ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
+ )
+ target_link_libraries(TestWebKitLegacy shlwapi)
+ add_test(TestWebKitLegacy ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitLegacy)
+ set_tests_properties(TestWebKitLegacy PROPERTIES TIMEOUT 60)
+
+ add_dependencies(TestWebKitLegacy TestWebKitLegacyLib)
+endif ()
+
set(test_main_SOURCES
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
)
add_dependencies(TestWebCore TestWebCoreLib)
-add_dependencies(TestWebKitLegacy TestWebKitLegacyLib)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
