Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'jb48786' into 'master'
[xulrunner-qt5] Reduce memory pressure during application startup. Contributes to JB#48786 See merge request mer-core/gecko-dev!66
- Loading branch information
Showing
3 changed files
with
42 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
rpm/0021-Disable-loading-extensions-and-assume-memory-constra.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
From 9bb0c01a65fdbedf53e3e7cf8dd7076a74f3b548 Mon Sep 17 00:00:00 2001 | ||
From: Andrew den Exter <andrew.den.exter@qinetic.com.au> | ||
Date: Wed, 25 Mar 2020 06:15:06 +0000 | ||
Subject: [PATCH] Disable loading extensions and assume memory constraints. | ||
|
||
--- | ||
toolkit/mozapps/extensions/extensions.manifest | 2 +- | ||
tools/profiler/public/GeckoProfilerImpl.h | 2 +- | ||
2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/extensions/extensions.manifest | ||
index 22c880f..f841e74 100644 | ||
--- a/toolkit/mozapps/extensions/extensions.manifest | ||
+++ b/toolkit/mozapps/extensions/extensions.manifest | ||
@@ -5,7 +5,7 @@ component {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} nsBlocklistServiceContent.js pr | ||
contract @mozilla.org/extensions/blocklist;1 {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} process=content | ||
|
||
category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400 | ||
-#ifndef MOZ_WIDGET_GONK | ||
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_QT) | ||
component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js | ||
contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa} | ||
#ifndef MOZ_WIDGET_ANDROID | ||
diff --git a/tools/profiler/public/GeckoProfilerImpl.h b/tools/profiler/public/GeckoProfilerImpl.h | ||
index 3792bb1..c8b76c8 100644 | ||
--- a/tools/profiler/public/GeckoProfilerImpl.h | ||
+++ b/tools/profiler/public/GeckoProfilerImpl.h | ||
@@ -359,7 +359,7 @@ static inline void profiler_tracing(const char* aCategory, const char* aInfo, | ||
/* FIXME/bug 789667: memory constraints wouldn't much of a problem for | ||
* this small a sample buffer size, except that serializing the | ||
* profile data is extremely, unnecessarily memory intensive. */ | ||
-#ifdef MOZ_WIDGET_GONK | ||
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_QT) | ||
# define PLATFORM_LIKELY_MEMORY_CONSTRAINED | ||
#endif | ||
|
||
-- | ||
1.8.3-rc3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters