MFH: r529155

www/firefox: backport fix for a warning after r527804

JavaScript error: resource:///modules/BrowserGlue.jsm, line 2210: TypeError: Services.profiler is undefined

Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2020-03-26 00:29:51 +00:00
parent 961c1dbb54
commit 2eef7fe6f8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q1/; revision=529159
2 changed files with 29 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= firefox
DISTVERSION= 74.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

View File

@ -0,0 +1,28 @@
Silence Service.profiler errors on Tier3 after bug 1613390
diff --git browser/components/BrowserGlue.jsm browser/components/BrowserGlue.jsm
index 8f86bf0584a99..2ce53c6921d15 100644
--- browser/components/BrowserGlue.jsm
+++ browser/components/BrowserGlue.jsm
@@ -2300,7 +2300,9 @@ BrowserGlue.prototype = {
ChromeUtils.idleDispatch(
() => {
if (!Services.startup.shuttingDown) {
- Services.profiler.AddMarker("startupIdleTask");
+ if (Services.profiler) {
+ Services.profiler.AddMarker("startupIdleTask");
+ }
try {
task.task();
} catch (ex) {
@@ -2371,7 +2373,9 @@ BrowserGlue.prototype = {
for (let task of idleTasks) {
ChromeUtils.idleDispatch(() => {
if (!Services.startup.shuttingDown) {
- Services.profiler.AddMarker("startupLateIdleTask");
+ if (Services.profiler) {
+ Services.profiler.AddMarker("startupLateIdleTask");
+ }
try {
task();
} catch (ex) {