Title: [213052] releases/WebKitGTK/webkit-2.16
- Revision
- 213052
- Author
- [email protected]
- Date
- 2017-02-27 05:58:10 -0800 (Mon, 27 Feb 2017)
Log Message
Merge r212829 - [GTK] [2.15.90] Disable RESOURCE_USAGE on non-Linux systems
https://bugs.webkit.org/show_bug.cgi?id=168714
Reviewed by Carlos Garcia Campos.
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/ChangeLog (213051 => 213052)
--- releases/WebKitGTK/webkit-2.16/ChangeLog 2017-02-27 13:57:24 UTC (rev 213051)
+++ releases/WebKitGTK/webkit-2.16/ChangeLog 2017-02-27 13:58:10 UTC (rev 213052)
@@ -1,3 +1,12 @@
+2017-02-22 Alberto Garcia <[email protected]>
+
+ [GTK] [2.15.90] Disable RESOURCE_USAGE on non-Linux systems
+ https://bugs.webkit.org/show_bug.cgi?id=168714
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2017-02-23 Tomas Popela <[email protected]>
[GTK] Compilation fails if using ninja together with icecream and cmake > 3.5
Modified: releases/WebKitGTK/webkit-2.16/Source/cmake/OptionsGTK.cmake (213051 => 213052)
--- releases/WebKitGTK/webkit-2.16/Source/cmake/OptionsGTK.cmake 2017-02-27 13:57:24 UTC (rev 213051)
+++ releases/WebKitGTK/webkit-2.16/Source/cmake/OptionsGTK.cmake 2017-02-27 13:58:10 UTC (rev 213052)
@@ -130,8 +130,10 @@
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PUBLIC OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
endif ()
# Public options shared with other WebKit ports. Do not add any options here
@@ -170,7 +172,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
