Unreviewed. Disable the WebProcess memory monitor in 32 bits.

* WebProcess/WebProcess.cpp: (WebKit::WebProcess::initializeWebProcess):
WebKit · Jan 24, 2018 · 33a48a9 · 33a48a9
1 parent 6b7fe40
commit 33a48a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Disable the WebProcess memory monitor in 32 bits.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+
 2017-10-27  Daniel Bates  <dabates@apple.com>
 
         Attempt to fix the Apple El Capitan build following <https://trac.webkit.org/changeset/224134>

diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
@@ -265,6 +265,7 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
             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();
@@ -276,6 +277,7 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
         memoryPressureHandler.setDidExceedInactiveLimitWhileActiveCallback([this] () {
             parentProcessConnection()->send(Messages::WebProcessProxy::DidExceedInactiveMemoryLimitWhileActive(), 0);
         });
+#endif
 #endif
         memoryPressureHandler.setMemoryPressureStatusChangedCallback([this](bool isUnderMemoryPressure) {
             if (parentProcessConnection())