diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-02-28 04:32:28 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-02-28 04:32:28 +0000 |
| commit | b139b27679e877bf15bf3c479c509083873b2cd5 (patch) | |
| tree | 609ef5a97fb0ae2966c62b228dd41191cb69dda8 /www/firefox/files/patch-bug1303380 | |
| parent | multimedia/plexmediaserver{-plexpass}: Add option for Plex Relay (diff) | |
www/firefox: update to 52.0 (rc1)
More candidates are likely to come before the official announcement (aka
the rush hour) scheduled on 2017-03-07. This one intended to pick up upstream
security fixes earlier while looking for downstream regressions.
Changes: https://www.mozilla.org/firefox/52.0/releasenotes/
Security: 96eca031-1313-4daf-9be2-9d6e1c4f1eb5
MFH: 2017Q1 (piling up, requires r431637 + r434531)
Diffstat (limited to 'www/firefox/files/patch-bug1303380')
| -rw-r--r-- | www/firefox/files/patch-bug1303380 | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/www/firefox/files/patch-bug1303380 b/www/firefox/files/patch-bug1303380 deleted file mode 100644 index 5753fc87030f..000000000000 --- a/www/firefox/files/patch-bug1303380 +++ /dev/null @@ -1,26 +0,0 @@ -commit c0fd0d3 -Author: Jared Wein <jwein@mozilla.com> -Date: Mon Sep 19 15:40:28 2016 -0400 - - Bug 1303380 - Wrap the telemetry code in _firstWindowLoaded with a try/catch to allow startup and migration code to run to completion if there is an exception writing to Telemetry. r=gijs - - MozReview-Commit-ID: DPfq6lZ4fM3 ---- - browser/components/nsBrowserGlue.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git browser/components/nsBrowserGlue.js browser/components/nsBrowserGlue.js -index eebbef2..20706fd 100644 ---- browser/components/nsBrowserGlue.js -+++ browser/components/nsBrowserGlue.js -@@ -931,7 +931,9 @@ BrowserGlue.prototype = { - } - if (SCALING_PROBE_NAME) { - let scaling = aWindow.devicePixelRatio * 100; -- Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling); -+ try { -+ Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling); -+ } catch (ex) {} - } - }, - |