Changeset 219605 in webkit
- Timestamp:
- Jul 18, 2017 12:20:33 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 23 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r219602 r219605 1 2017-07-17 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Add initial implementation of WebDriver process to run the HTTP server 4 https://bugs.webkit.org/show_bug.cgi?id=166682 5 6 Reviewed by Brian Burg. 7 8 Enable WebDriver in the GTK port by default. 9 10 * Source/CMakeLists.txt: 11 * Source/cmake/OptionsGTK.cmake: 12 * Source/cmake/WebKitFS.cmake: 13 * Source/cmake/WebKitFeatures.cmake: 14 1 15 2017-07-17 Konstantin Tokarev <annulen@yandex.ru> 2 16 -
trunk/Source/CMakeLists.txt
r219488 r219605 39 39 endif () 40 40 41 if (ENABLE_WEBDRIVER) 42 add_subdirectory(WebDriver) 43 endif () 44 41 45 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 42 46 -
trunk/Source/cmake/OptionsGTK.cmake
r219547 r219605 144 144 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON) 145 145 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON) 146 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON) 146 147 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF) 147 148 … … 277 278 endif () 278 279 280 if (ENABLE_WEBDRIVER) 281 # WebDriver requires newer versions of GLib and Soup. 282 if (PC_GLIB_VERSION VERSION_LESS "2.40") 283 message(FATAL_ERROR "GLib 2.40 is required to enable WebDriver support.") 284 endif () 285 if (PC_LIBSOUP_VERSION VERSION_LESS "2.48") 286 message(FATAL_ERROR "libsoup 2.48 is required to enable WebDriver support.") 287 endif () 288 endif () 289 279 290 SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE) 280 291 -
trunk/Source/cmake/WebKitFS.cmake
r219494 r219605 26 26 set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools") 27 27 endif () 28 if (NOT WEBDRIVER_DIR) 29 set(WEBDRIVER_DIR "${CMAKE_SOURCE_DIR}/Source/WebDriver") 30 endif () 28 31 29 32 set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources") 30 33 set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore") 31 34 set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore") 35 set(DERIVED_SOURCES_WEBDRIVER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver") 32 36 set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy") 33 37 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit") … … 57 61 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}) 58 62 endif () 63 64 if (ENABLE_WEBDRIVER) 65 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR}) 66 endif () -
trunk/Source/cmake/WebKitFeatures.cmake
r219403 r219605 183 183 WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" PRIVATE ON) 184 184 WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY "Toggle WebAssembly support" PRIVATE ${ENABLE_FTL_DEFAULT}) 185 WEBKIT_OPTION_DEFINE(ENABLE_WEBDRIVER "Whether to enable the WebDriver service process" PRIVATE OFF) 185 186 WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle WebGL support" PRIVATE OFF) 186 187 WEBKIT_OPTION_DEFINE(ENABLE_WEBGL2 "Toggle WebGL 2.0 support" PRIVATE OFF)
Note: See TracChangeset
for help on using the changeset viewer.