Title: [242447] releases/WebKitGTK/webkit-2.24/Source/WebKit
Revision
242447
Author
carlo...@webkit.org
Date
2019-03-05 04:40:57 -0800 (Tue, 05 Mar 2019)

Log Message

Merge r242012 - [WPE] Install MemoryPressureHandler in UIProcess
https://bugs.webkit.org/show_bug.cgi?id=194617

Reviewed by Žan Doberšek.

Currently only GTK and Cocoa ports run MemoryPressureHandler in the UI process. WPE should
too.

We need @no-unify to avoid changing the unified source bundles under API/, which are
notoriously fragile. (WebMemoryPressureHandler.cpp sorts just above API/.)

* SourcesWPE.txt:
* UIProcess/WebMemoryPressureHandler.cpp:
(WebKit::installMemoryPressureHandler):
* UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitialize):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (242446 => 242447)


--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog	2019-03-05 12:40:53 UTC (rev 242446)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog	2019-03-05 12:40:57 UTC (rev 242447)
@@ -1,3 +1,22 @@
+2019-02-24  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        [WPE] Install MemoryPressureHandler in UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=194617
+
+        Reviewed by Žan Doberšek.
+
+        Currently only GTK and Cocoa ports run MemoryPressureHandler in the UI process. WPE should
+        too.
+
+        We need @no-unify to avoid changing the unified source bundles under API/, which are
+        notoriously fragile. (WebMemoryPressureHandler.cpp sorts just above API/.)
+
+        * SourcesWPE.txt:
+        * UIProcess/WebMemoryPressureHandler.cpp:
+        (WebKit::installMemoryPressureHandler):
+        * UIProcess/glib/WebProcessPoolGLib.cpp:
+        (WebKit::WebProcessPool::platformInitialize):
+
 2019-02-22  Alexander Mikhaylenko  <exalm7...@gmail.com>
 
         [GTK] Navigation gesture improvements

Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesWPE.txt (242446 => 242447)


--- releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesWPE.txt	2019-03-05 12:40:53 UTC (rev 242446)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/SourcesWPE.txt	2019-03-05 12:40:57 UTC (rev 242447)
@@ -102,6 +102,7 @@
 UIProcess/DefaultUndoController.cpp
 UIProcess/LegacySessionStateCodingNone.cpp
 UIProcess/WebGrammarDetail.cpp
+UIProcess/WebMemoryPressureHandler.cpp @no-unify
 UIProcess/WebViewportAttributes.cpp
 
 UIProcess/API/C/WKGrammarDetail.cpp

Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebMemoryPressureHandler.cpp (242446 => 242447)


--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebMemoryPressureHandler.cpp	2019-03-05 12:40:53 UTC (rev 242446)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebMemoryPressureHandler.cpp	2019-03-05 12:40:57 UTC (rev 242447)
@@ -26,10 +26,13 @@
 #include "config.h"
 #include "WebMemoryPressureHandler.h"
 
-#include "ViewSnapshotStore.h"
 #include "WebProcessPool.h"
 #include <wtf/MemoryPressureHandler.h>
 
+#if PLATFORM(COCOA) || PLATFORM(GTK)
+#include "ViewSnapshotStore.h"
+#endif
+
 namespace WebKit {
 
 void installMemoryPressureHandler()
@@ -36,7 +39,9 @@
 {
     auto& memoryPressureHandler = MemoryPressureHandler::singleton();
     memoryPressureHandler.setLowMemoryHandler([] (Critical critical, Synchronous) {
+#if PLATFORM(COCOA) || PLATFORM(GTK)
         ViewSnapshotStore::singleton().discardSnapshotImages();
+#endif
 
         for (auto* processPool : WebProcessPool::allProcessPools())
             processPool->handleMemoryPressureWarning(critical);

Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (242446 => 242447)


--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp	2019-03-05 12:40:53 UTC (rev 242446)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp	2019-03-05 12:40:57 UTC (rev 242447)
@@ -78,12 +78,8 @@
         initializeRemoteInspectorServer(address);
 #endif
 
-#if PLATFORM(GTK)
-    // To enable this for WPE, we need WebMemoryPressureHandler to lose the
-    // hard dependency on ViewSnapshotStore.
     if (!memoryPressureMonitorDisabled())
         installMemoryPressureHandler();
-#endif
 }
 
 void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to