Diff
Modified: trunk/ChangeLog (261461 => 261462)
--- trunk/ChangeLog 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/ChangeLog 2020-05-10 23:56:21 UTC (rev 261462)
@@ -1,3 +1,19 @@
+2020-05-10 Basuke Suzuki <[email protected]>
+
+ Add ENABLE_PERIODIC_MEMORY_MONITOR flag.
+ https://bugs.webkit.org/show_bug.cgi?id=211704
+
+ Reviewed by Yusuke Suzuki.
+
+ Define ENABLE_PERIODIC_MEMORY_MONITOR flags in specific platform's options.
+ Enable it for PlayStation port.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/OptionsPlayStation.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2020-05-09 Don Olmstead <[email protected]>
[CMake] Use WEBKIT_EXECUTABLE in MallocBench
Modified: trunk/Source/WTF/ChangeLog (261461 => 261462)
--- trunk/Source/WTF/ChangeLog 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/WTF/ChangeLog 2020-05-10 23:56:21 UTC (rev 261462)
@@ -1,3 +1,15 @@
+2020-05-10 Basuke Suzuki <[email protected]>
+
+ Add ENABLE_PERIODIC_MEMORY_MONITOR flag.
+ https://bugs.webkit.org/show_bug.cgi?id=211704
+
+ Reviewed by Yusuke Suzuki.
+
+ Define ENABLE_PERIODIC_MEMORY_MONITOR flags in specific platform file.
+
+ * wtf/PlatformEnable.h:
+ * wtf/PlatformEnableCocoa.h:
+
2020-05-10 Darin Adler <[email protected]>
Remove now-unneeded HAVE(CORE_VIDEO)
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (261461 => 261462)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2020-05-10 23:56:21 UTC (rev 261462)
@@ -416,6 +416,10 @@
#define ENABLE_PAYMENT_REQUEST 0
#endif
+#if !defined(ENABLE_PERIODIC_MEMORY_MONITOR)
+#define ENABLE_PERIODIC_MEMORY_MONITOR 0
+#endif
+
#if !defined(ENABLE_POINTER_LOCK)
#define ENABLE_POINTER_LOCK 1
#endif
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (261461 => 261462)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-05-10 23:56:21 UTC (rev 261462)
@@ -207,6 +207,10 @@
#define ENABLE_PAYMENT_REQUEST 1
#endif
+#if !defined(ENABLE_PERIODIC_MEMORY_MONITOR) && PLATFORM(MAC)
+#define ENABLE_PERIODIC_MEMORY_MONITOR 1
+#endif
+
#if !defined(ENABLE_ASYNC_SCROLLING)
#define ENABLE_ASYNC_SCROLLING 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (261461 => 261462)
--- trunk/Source/WebKit/ChangeLog 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/WebKit/ChangeLog 2020-05-10 23:56:21 UTC (rev 261462)
@@ -1,3 +1,17 @@
+2020-05-10 Basuke Suzuki <[email protected]>
+
+ Add ENABLE_PERIODIC_MEMORY_MONITOR flag.
+ https://bugs.webkit.org/show_bug.cgi?id=211704
+
+ Reviewed by Yusuke Suzuki.
+
+ No new tests because there's no behavior change.
+
+ Replace PLATFORM() macros with ENABLE() macro.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2020-05-10 Michael Catanzaro <[email protected]>
REGRESSION(r261270): Broke build with python3
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (261461 => 261462)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-05-10 23:56:21 UTC (rev 261462)
@@ -353,7 +353,7 @@
auto maintainMemoryCache = m_isSuspending && m_hasSuspendedPageProxy ? WebCore::MaintainMemoryCache::Yes : WebCore::MaintainMemoryCache::No;
WebCore::releaseMemory(critical, synchronous, maintainBackForwardCache, maintainMemoryCache);
});
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE)
+#if ENABLE(PERIODIC_MEMORY_MONITOR)
memoryPressureHandler.setShouldUsePeriodicMemoryMonitor(true);
memoryPressureHandler.setMemoryKillCallback([this] () {
WebCore::logMemoryStatisticsAtTimeOfDeath();
Modified: trunk/Source/cmake/OptionsGTK.cmake (261461 => 261462)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-05-10 23:56:21 UTC (rev 261462)
@@ -186,6 +186,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
Modified: trunk/Source/cmake/OptionsMac.cmake (261461 => 261462)
--- trunk/Source/cmake/OptionsMac.cmake 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/cmake/OptionsMac.cmake 2020-05-10 23:56:21 UTC (rev 261462)
@@ -71,6 +71,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAYMENT_REQUEST PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (261461 => 261462)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2020-05-10 23:56:21 UTC (rev 261462)
@@ -31,6 +31,7 @@
# Enabled features
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
# Experimental features
Modified: trunk/Source/cmake/OptionsWPE.cmake (261461 => 261462)
--- trunk/Source/cmake/OptionsWPE.cmake 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/cmake/OptionsWPE.cmake 2020-05-10 23:56:21 UTC (rev 261462)
@@ -66,6 +66,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PUBLIC ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (261461 => 261462)
--- trunk/Source/cmake/WebKitFeatures.cmake 2020-05-10 22:37:39 UTC (rev 261461)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2020-05-10 23:56:21 UTC (rev 261462)
@@ -182,6 +182,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_OVERFLOW_SCROLLING_TOUCH "Toggle accelerated scrolling support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_PAYMENT_REQUEST "Toggle Payment Request support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_PERIODIC_MEMORY_MONITOR "Toggle periodical memory monitor support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_PICTURE_IN_PICTURE_API "Toggle Picture-in-Picture API support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_POINTER_LOCK "Toggle pointer lock support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_PUBLIC_SUFFIX_LIST "Toggle public suffix list support" PRIVATE ON)
