Title: [223546] releases/WebKitGTK/webkit-2.18
- Revision
- 223546
- Author
- [email protected]
- Date
- 2017-10-17 07:35:49 -0700 (Tue, 17 Oct 2017)
Log Message
Merge r221372 - [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: releases/WebKitGTK/webkit-2.18/ChangeLog (223545 => 223546)
--- releases/WebKitGTK/webkit-2.18/ChangeLog 2017-10-17 14:34:41 UTC (rev 223545)
+++ releases/WebKitGTK/webkit-2.18/ChangeLog 2017-10-17 14:35:49 UTC (rev 223546)
@@ -1,3 +1,16 @@
+2017-08-30 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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-11 Konstantin Tokarev <[email protected]>
[CMake] Fix broken use of REQUIRED with find modules
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (223545 => 223546)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-10-17 14:34:41 UTC (rev 223545)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-10-17 14:35:49 UTC (rev 223546)
@@ -1,3 +1,15 @@
+2017-08-30 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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-11 Adrian Perez de Castro <[email protected]>
[WPE] Build failure with Clang 4.0.1: no matching conversion for functional-style cast from 'pointer' (aka 'unsigned short *') to 'WTF::String'
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/wpe/WPEView.cpp (223545 => 223546)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2017-10-17 14:34:41 UTC (rev 223545)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2017-10-17 14:35:49 UTC (rev 223546)
@@ -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: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake (223545 => 223546)
--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake 2017-10-17 14:34:41 UTC (rev 223545)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake 2017-10-17 14:35:49 UTC (rev 223546)
@@ -124,10 +124,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: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWPE.cmake (223545 => 223546)
--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWPE.cmake 2017-10-17 14:34:41 UTC (rev 223545)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWPE.cmake 2017-10-17 14:35:49 UTC (rev 223546)
@@ -36,8 +36,10 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT 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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
