Title: [285062] trunk/Source/WebKit
- Revision
- 285062
- Author
- [email protected]
- Date
- 2021-10-29 16:48:11 -0700 (Fri, 29 Oct 2021)
Log Message
Fix WPE build after r285047
https://bugs.webkit.org/show_bug.cgi?id=232462
* UIProcess/soup/WebProcessPoolSoup.cpp:
(WebKit::memoryPressureMonitorDisabledSoup):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
(WebKit::memoryPressureMonitorDisabled): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (285061 => 285062)
--- trunk/Source/WebKit/ChangeLog 2021-10-29 23:29:51 UTC (rev 285061)
+++ trunk/Source/WebKit/ChangeLog 2021-10-29 23:48:11 UTC (rev 285062)
@@ -1,5 +1,15 @@
2021-10-29 Alex Christensen <[email protected]>
+ Fix WPE build after r285047
+ https://bugs.webkit.org/show_bug.cgi?id=232462
+
+ * UIProcess/soup/WebProcessPoolSoup.cpp:
+ (WebKit::memoryPressureMonitorDisabledSoup):
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ (WebKit::memoryPressureMonitorDisabled): Deleted.
+
+2021-10-29 Alex Christensen <[email protected]>
+
Unreviewed, reverting r284917.
<rdar://84807461>
Modified: trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp (285061 => 285062)
--- trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp 2021-10-29 23:29:51 UTC (rev 285061)
+++ trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp 2021-10-29 23:48:11 UTC (rev 285062)
@@ -37,7 +37,9 @@
std::optional<MemoryPressureHandler::Configuration> WebProcessPool::s_networkProcessMemoryPressureHandlerConfiguration;
-static bool memoryPressureMonitorDisabled()
+// This is duplicate code with memoryPressureMonitorDisabled.
+// FIXME: Put a declaration in a header and make one definition.
+static bool memoryPressureMonitorDisabledSoup()
{
static const char* disableMemoryPressureMonitor = getenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR");
return disableMemoryPressureMonitor && !strcmp(disableMemoryPressureMonitor, "1");
@@ -48,7 +50,7 @@
parameters.languages = userPreferredLanguages();
parameters.memoryPressureHandlerConfiguration = s_networkProcessMemoryPressureHandlerConfiguration;
- if (memoryPressureMonitorDisabled())
+ if (memoryPressureMonitorDisabledSoup())
parameters.shouldSuppressMemoryPressureHandler = true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
