Title: [172623] trunk
- Revision
- 172623
- Author
- carlo...@webkit.org
- Date
- 2014-08-15 04:30:15 -0700 (Fri, 15 Aug 2014)
Log Message
[GTK] Disable memory sampler on non-Linux system
https://bugs.webkit.org/show_bug.cgi?id=134483
Patch by Ting-Wei Lan <lant...@gmail.com> on 2014-08-15
Reviewed by Philippe Normand.
Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp only works on
Linux because it uses many Linux-specific features, so we should disable
memory sampler on other systems by default.
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (172622 => 172623)
--- trunk/ChangeLog 2014-08-15 09:16:07 UTC (rev 172622)
+++ trunk/ChangeLog 2014-08-15 11:30:15 UTC (rev 172623)
@@ -1,3 +1,16 @@
+2014-08-15 Ting-Wei Lan <lant...@gmail.com>
+
+ [GTK] Disable memory sampler on non-Linux system
+ https://bugs.webkit.org/show_bug.cgi?id=134483
+
+ Reviewed by Philippe Normand.
+
+ Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp only works on
+ Linux because it uses many Linux-specific features, so we should disable
+ memory sampler on other systems by default.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2014-08-15 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] HTML API documentation should also be installed versioned
Modified: trunk/Source/cmake/OptionsGTK.cmake (172622 => 172623)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-15 09:16:07 UTC (rev 172622)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-15 11:30:15 UTC (rev 172623)
@@ -96,6 +96,12 @@
set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
endif ()
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
+else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER OFF)
+endif ()
+
# FIXME: We want to expose fewer options to downstream, but for now everything is public.
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
@@ -127,7 +133,6 @@
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)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_HWCONCURRENCY ON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
