Diff
Modified: trunk/ChangeLog (170963 => 170964)
--- trunk/ChangeLog 2014-07-10 15:39:49 UTC (rev 170963)
+++ trunk/ChangeLog 2014-07-10 16:11:11 UTC (rev 170964)
@@ -1,3 +1,17 @@
+2014-07-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Use the same default options for production builds that previous stable releases
+ https://bugs.webkit.org/show_bug.cgi?id=134589
+
+ Reviewed by Martin Robinson.
+
+ Change the default value of some features to match our stable releases.
+ Add FindCairoGL to find cairo-gl libraries and make accelearetd 2D
+ canvas depend on whether cairo-gl is found.
+
+ * Source/cmake/FindCairoGL.cmake: Added.
+ * Source/cmake/OptionsGTK.cmake:
+
2014-07-08 Sun-woo Nam <[email protected]>
[EFL] Support Encrypted Media Extensions.
Added: trunk/Source/cmake/FindCairoGL.cmake (0 => 170964)
--- trunk/Source/cmake/FindCairoGL.cmake (rev 0)
+++ trunk/Source/cmake/FindCairoGL.cmake 2014-07-10 16:11:11 UTC (rev 170964)
@@ -0,0 +1,46 @@
+# - Try to find CairoGL
+# Once done, this will define
+#
+# CAIRO_GL_FOUND - system has CairoGL
+# CAIRO_GL_INCLUDE_DIRS - the CairoGL include directories
+# CAIRO_GL_LIBRARIES - link these to use CairoGL
+#
+# Copyright (C) 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(CAIRO_GL cairo-gl)
+
+# At the moment CairoGL does not add any extra cflags and libraries, so we can
+# safely ignore CAIRO_GL_LIBRARIES and CAIRO_GL_INCLUDE_DIRS for the moment.
+foreach (_component ${CairoGL_FIND_COMPONENTS})
+ string(TOUPPER ${_component} _UPPER_NAME)
+ string(REGEX REPLACE "-" "_" _UPPER_NAME ${_UPPER_NAME})
+ pkg_check_modules(${_UPPER_NAME} ${_component})
+ set(CAIRO_GL_INCLUDE_DIRS ${CAIRO_GL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
+ set(CAIRO_GL_LIBRARIES ${CAIRO_GL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
+endforeach ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIRO_GL_INCLUDE_DIRS CAIRO_GL_LIBRARIES)
+
Modified: trunk/Source/cmake/OptionsGTK.cmake (170963 => 170964)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-07-10 15:39:49 UTC (rev 170963)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-07-10 16:11:11 UTC (rev 170964)
@@ -13,6 +13,8 @@
set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
+set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
+set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
@@ -35,12 +37,44 @@
find_package(GObjectIntrospection)
find_package(OpenGL)
find_package(EGL)
+find_package(GeoClue2 2.1.5)
+if (NOT GEOCLUE2_FOUND)
+ find_package(GeoClue)
+endif ()
+
+if (ENABLE_X11_TARGET)
+ # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
+ check_include_files("GL/glx.h" GLX_FOUND)
+endif ()
+
WEBKIT_OPTION_BEGIN()
if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
+
+ if (GLX_FOUND)
+ list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
+ endif ()
+ if (EGL_FOUND)
+ list(APPEND CAIRO_GL_COMPONENTS cairo-egl)
+ endif ()
+ find_package(CairoGL 1.10.2 COMPONENTS ${CAIRO_GL_COMPONENTS})
+ if (CAIRO_GL_FOUND)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS ON)
+ else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
+ endif ()
+else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
endif ()
+if (GEOCLUE2_FOUND OR GEOCLUE_FOUND)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION ON)
+else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION OFF)
+endif ()
+
if (DEVELOPER_MODE)
set(ENABLE_TOOLS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
@@ -54,26 +88,31 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_WEB_AUDIO OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
@@ -92,7 +131,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIBRATION OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
@@ -101,9 +140,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF)
WEBKIT_OPTION_END()
-set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
-set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
-
if (ENABLE_X11_TARGET)
add_definitions(-DWTF_PLATFORM_X11=1)
add_definitions(-DMOZ_X11=1)
@@ -194,11 +230,9 @@
find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components})
if (ENABLE_GEOLOCATION)
- find_package(GeoClue2 2.1.5)
if (GEOCLUE2_FOUND)
set(WTF_USE_GEOCLUE2 1)
else ()
- find_package(GeoClue)
set(WTF_USE_GEOCLUE2 0)
endif ()
endif ()
@@ -220,8 +254,6 @@
if (ENABLE_X11_TARGET)
set(REQUIRED_INCLUDES_OLD ${CMAKE_REQUIRED_INCLUDES})
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
- # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
- check_include_files("GL/glx.h" GLX_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
if (GLX_FOUND)
Modified: trunk/Tools/ChangeLog (170963 => 170964)
--- trunk/Tools/ChangeLog 2014-07-10 15:39:49 UTC (rev 170963)
+++ trunk/Tools/ChangeLog 2014-07-10 16:11:11 UTC (rev 170964)
@@ -1,3 +1,16 @@
+2014-07-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Use the same default options for production builds that previous stable releases
+ https://bugs.webkit.org/show_bug.cgi?id=134589
+
+ Reviewed by Martin Robinson.
+
+ Make sure all features enabled in production builds are also
+ enabled in developer mode.
+
+ * Scripts/webkitperl/FeatureList.pm: Enable ACCELERATED_2D_CANVAS
+ and CSS_FILTERS for the GTK port.
+
2014-07-09 Brent Fulgham <[email protected]>
[Win] Remove uses of 'bash' in build system
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (170963 => 170964)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-07-10 15:39:49 UTC (rev 170963)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-07-10 16:11:11 UTC (rev 170964)
@@ -155,7 +155,7 @@
define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDRenderingSupport },
{ option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
- define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
+ define => "ENABLE_ACCELERATED_2D_CANVAS", default => isGtk(), value => \$accelerated2DCanvasSupport },
{ option => "battery-status", desc => "Toggle Battery Status support",
define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
@@ -179,7 +179,7 @@
define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
{ option => "css-filters", desc => "Toggle CSS Filters support",
- define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit() || isEfl()), value => \$cssFiltersSupport },
+ define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit() || isEfl() || isGtk()), value => \$cssFiltersSupport },
{ option => "css-grid-layout", desc => "Toggle CSS Grid Layout support",
define => "ENABLE_CSS_GRID_LAYOUT", default => 1, value => \$cssGridLayoutSupport },
