Title: [227494] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 227494
- Author
- [email protected]
- Date
- 2018-01-24 01:40:22 -0800 (Wed, 24 Jan 2018)
Log Message
Unreviewed. Disable the WebProcess memory monitor in 32 bits.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (227493 => 227494)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2018-01-24 09:37:27 UTC (rev 227493)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2018-01-24 09:40:22 UTC (rev 227494)
@@ -1,3 +1,10 @@
+2018-01-24 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Disable the WebProcess memory monitor in 32 bits.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2017-10-27 Daniel Bates <[email protected]>
Attempt to fix the Apple El Capitan build following <https://trac.webkit.org/changeset/224134>
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebProcess.cpp (227493 => 227494)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-24 09:37:27 UTC (rev 227493)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-24 09:40:22 UTC (rev 227494)
@@ -265,6 +265,7 @@
WebCore::releaseMemory(critical, synchronous);
});
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || PLATFORM(GTK) || PLATFORM(WPE)
+#if CPU(X86_64) || CPU(ARM64)
memoryPressureHandler.setShouldUsePeriodicMemoryMonitor(true);
memoryPressureHandler.setMemoryKillCallback([this] () {
WebCore::logMemoryStatisticsAtTimeOfDeath();
@@ -277,6 +278,7 @@
parentProcessConnection()->send(Messages::WebProcessProxy::DidExceedInactiveMemoryLimitWhileActive(), 0);
});
#endif
+#endif
memoryPressureHandler.setMemoryPressureStatusChangedCallback([this](bool isUnderMemoryPressure) {
if (parentProcessConnection())
parentProcessConnection()->send(Messages::WebProcessProxy::MemoryPressureStatusChanged(isUnderMemoryPressure), 0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
