Skip to content

Commit

Permalink
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
adenexter committed Mar 26, 2020
2 parents 96f9d84 + 9a33fc3 commit 8b3c872
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 1 deletion.
2 changes: 1 addition & 1 deletion embedding/embedlite/embedding.js
Expand Up @@ -388,7 +388,7 @@ pref("media.peerconnection.enabled", false);
pref("media.useAudioChannelService", true);

pref("extensions.blocklist.enabled", false);
pref("extensions.logging.enabled", true);
pref("extensions.logging.enabled", false);
pref("extensions.strictCompatibility", false);
pref("extensions.minCompatibleAppVersion", "11.0");

Expand Down
@@ -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

2 changes: 2 additions & 0 deletions rpm/xulrunner-qt5.spec
Expand Up @@ -63,6 +63,7 @@ Patch17: 0017-Make-gc-stats-work-with-gcc8.patch
Patch18: 0018-Use-libcontentaction-for-custom-schem.patch
Patch19: 0019-Allow-compositor-specializations-to-override-the-com.patch
Patch20: 0020-Handle-temporary-directory-similarly-as-in-MacOSX.patch
Patch21: 0021-Disable-loading-extensions-and-assume-memory-constra.patch

BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Network)
Expand Down Expand Up @@ -172,6 +173,7 @@ Tests and misc files for xulrunner.
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1

mkdir -p "%BUILD_DIR"
cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig
Expand Down

0 comments on commit 8b3c872

Please sign in to comment.