Title: [221372] trunk
- Revision
- 221372
- Author
- clo...@igalia.com
- Date
- 2017-08-30 08:06:43 -0700 (Wed, 30 Aug 2017)
Log Message
[WPE] Enable MEMORY_SAMPLER
https://bugs.webkit.org/show_bug.cgi?id=176099
Reviewed by Michael Catanzaro.
.:
Enable the otion at build time by default on Linux (currently
there are only Linux and Mac implementations of this feature).
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/OptionsGTK.cmake:
Source/WebKit:
Enable it at runtime if the environment variable WEBKIT_SAMPLE_MEMORY is set.
* UIProcess/API/wpe/WPEView.cpp:
(WKWPE::m_compositingManagerProxy):
Modified Paths
Diff
Modified: trunk/ChangeLog (221371 => 221372)
--- trunk/ChangeLog 2017-08-30 13:22:25 UTC (rev 221371)
+++ trunk/ChangeLog 2017-08-30 15:06:43 UTC (rev 221372)
@@ -1,3 +1,16 @@
+2017-08-30 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE] Enable MEMORY_SAMPLER
+ https://bugs.webkit.org/show_bug.cgi?id=176099
+
+ Reviewed by Michael Catanzaro.
+
+ Enable the otion at build time by default on Linux (currently
+ there are only Linux and Mac implementations of this feature).
+
+ * Source/cmake/OptionsWPE.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
2017-08-30 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix versions numbers after r221136.
Modified: trunk/Source/WebKit/ChangeLog (221371 => 221372)
--- trunk/Source/WebKit/ChangeLog 2017-08-30 13:22:25 UTC (rev 221371)
+++ trunk/Source/WebKit/ChangeLog 2017-08-30 15:06:43 UTC (rev 221372)
@@ -1,3 +1,15 @@
+2017-08-30 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE] Enable MEMORY_SAMPLER
+ https://bugs.webkit.org/show_bug.cgi?id=176099
+
+ Reviewed by Michael Catanzaro.
+
+ Enable it at runtime if the environment variable WEBKIT_SAMPLE_MEMORY is set.
+
+ * UIProcess/API/wpe/WPEView.cpp:
+ (WKWPE::m_compositingManagerProxy):
+
2017-08-30 Andy Estes <aes...@apple.com>
[Mac] Upstream Carbon-related WebKitSystemInterface functions
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp (221371 => 221372)
--- trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2017-08-30 13:22:25 UTC (rev 221371)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2017-08-30 15:06:43 UTC (rev 221372)
@@ -66,6 +66,11 @@
auto* pool = configuration->processPool();
m_pageProxy = pool->createWebPage(*m_pageClient, WTFMove(configuration));
+#if ENABLE(MEMORY_SAMPLER)
+ if (getenv("WEBKIT_SAMPLE_MEMORY"))
+ pool->startMemorySampler(0);
+#endif
+
m_backend = backend;
if (!m_backend)
m_backend = wpe_view_backend_create();
Modified: trunk/Source/cmake/OptionsGTK.cmake (221371 => 221372)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-08-30 13:22:25 UTC (rev 221371)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-08-30 15:06:43 UTC (rev 221372)
@@ -123,10 +123,10 @@
endif ()
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE 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_MEMORY_SAMPLER PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
endif ()
Modified: trunk/Source/cmake/OptionsWPE.cmake (221371 => 221372)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-08-30 13:22:25 UTC (rev 221371)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-08-30 15:06:43 UTC (rev 221372)
@@ -36,8 +36,10 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
