Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 26 Mar 2020 00:29:51 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r529159 - in branches/2020Q1/www/firefox: . files
Message-ID:  <202003260029.02Q0Tpqi095934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Thu Mar 26 00:29:51 2020
New Revision: 529159
URL: https://svnweb.freebsd.org/changeset/ports/529159

Log:
  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

Added:
  branches/2020Q1/www/firefox/files/patch-bug1622551
     - copied unchanged from r529155, head/www/firefox/files/patch-bug1622551
Modified:
  branches/2020Q1/www/firefox/Makefile
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/www/firefox/Makefile
==============================================================================
--- branches/2020Q1/www/firefox/Makefile	Thu Mar 26 00:29:29 2020	(r529158)
+++ branches/2020Q1/www/firefox/Makefile	Thu Mar 26 00:29:51 2020	(r529159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	74.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Copied: branches/2020Q1/www/firefox/files/patch-bug1622551 (from r529155, head/www/firefox/files/patch-bug1622551)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/www/firefox/files/patch-bug1622551	Thu Mar 26 00:29:51 2020	(r529159, copy of r529155, head/www/firefox/files/patch-bug1622551)
@@ -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) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003260029.02Q0Tpqi095934>