mozilla rel-257 rebase part 15

comm-esr60/mozilla-esr60/patches/series

@@ -217,8 +217,6 @@ NOBUG-BACKOUT-1439860-60.patch
 TOP-9999999-rust133-257.patch
 TOP-9999999-fixlangpack-257.patch
 mozilla-esr60-top-nonexisting.patch
-1429016-67a1.patch
-1591803-1only-72a1.patch
 PARTLY-1445766-61a1.patch
 1584803-version-beta1.patch
 1515550-66a1.patch

comm-esr60/mozilla-esr60/patches/1429016-67a1.patch → rel-257/mozilla-esr60/patches/1429016-67a1.patch

@@ -2,53 +2,28 @@
 # User ui.manish <1991manish.kumar@gmail.com>
 # Date 1550915768 0
 # Node ID 9eb8e5cca281f47dbdcc9b43baba61a82d68258a
-# Parent  cbd2f7a3a2dd53f2cf65ba431a67c9356401ce55
+# Parent  e4df812ff61b876f4c9f5880ba5c9fefda46f528
 Bug 1429016 - Remove expiring WEB_NOTIFICATION_* telemetry probes r=MattN
 
 Differential Revision: https://phabricator.services.mozilla.com/D18877
 
-diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/components/preferences/in-content-new/privacy.js
---- a/browser/components/preferences/in-content-new/privacy.js
-+++ b/browser/components/preferences/in-content-new/privacy.js
-@@ -816,21 +816,16 @@ var gPrivacyPane = {
-   showNotificationExceptions() {
-     let bundlePreferences = document.getElementById("bundlePreferences");
+diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js
+--- a/browser/components/preferences/in-content/privacy.js
++++ b/browser/components/preferences/in-content/privacy.js
+@@ -1035,21 +1035,16 @@ var gPrivacyPane = {
      let params = { permissionType: "desktop-notification" };
-     params.windowTitle = bundlePreferences.getString("notificationspermissionstitle");
-     params.introText = bundlePreferences.getString("notificationspermissionstext4");
+     params.windowTitle = bundlePreferences.getString("notificationspermissionstitle2");
+     params.introText = bundlePreferences.getString("notificationspermissionstext6");
+     params.disablePermissionsLabel = bundlePreferences.getString("notificationspermissionsdisablelabel");
+     params.disablePermissionsDescription = bundlePreferences.getString("notificationspermissionsdisabledescription");
  
-     gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-                     "resizable=yes", params);
+     gSubDialog.open("chrome://browser/content/preferences/sitePermissions.xul",
+       "resizable=yes", params);
 -
 -    try {
 -      Services.telemetry
--              .getHistogramById("WEB_NOTIFICATION_EXCEPTIONS_OPENED").add();
--    } catch (e) {}
-   },
- 
- 
-   // POP-UPS
- 
-   /**
-    * Displays the popup exceptions dialog where specific site popup preferences
-    * can be set.
-diff --git a/browser/components/preferences/in-content/content.js b/browser/components/preferences/in-content/content.js
---- a/browser/components/preferences/in-content/content.js
-+++ b/browser/components/preferences/in-content/content.js
-@@ -121,21 +121,16 @@ var gContentPane = {
-   showNotificationExceptions() {
-     let bundlePreferences = document.getElementById("bundlePreferences");
-     let params = { permissionType: "desktop-notification" };
-     params.windowTitle = bundlePreferences.getString("notificationspermissionstitle");
-     params.introText = bundlePreferences.getString("notificationspermissionstext4");
- 
-     gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-                     "resizable=yes", params);
--
--    try {
--      Services.telemetry
--              .getHistogramById("WEB_NOTIFICATION_EXCEPTIONS_OPENED").add();
--    } catch (e) {}
+-        .getHistogramById("WEB_NOTIFICATION_EXCEPTIONS_OPENED").add();
+-    } catch (e) { }
    },
  
  
@@ -60,7 +35,7 @@ diff --git a/browser/components/preferences/in-content/content.js b/browser/comp
 diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
 --- a/dom/notification/Notification.cpp
 +++ b/dom/notification/Notification.cpp
-@@ -738,21 +738,16 @@ NotificationTelemetryService::RecordPerm
+@@ -655,21 +655,16 @@ void NotificationTelemetryService::Recor
      rv = enumerator->GetNext(getter_AddRefs(supportsPermission));
      if (NS_WARN_IF(NS_FAILED(rv))) {
        return;
@@ -77,17 +52,17 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
    }
  }
  
- bool
- NotificationTelemetryService::GetNotificationPermission(nsISupports* aSupports,
-                                                         uint32_t* aCapability)
- {
+ bool NotificationTelemetryService::GetNotificationPermission(
+     nsISupports* aSupports, uint32_t* aCapability) {
    nsCOMPtr<nsIPermission> permission = do_QueryInterface(aSupports);
-@@ -1361,30 +1356,26 @@ public:
+   if (!permission) {
+     return false;
+@@ -1198,30 +1193,26 @@ class NotificationClickWorkerRunnable fi
+ };
  
  NS_IMETHODIMP
  NotificationObserver::Observe(nsISupports* aSubject, const char* aTopic,
-                               const char16_t* aData)
- {
+                               const char16_t* aData) {
    AssertIsOnMainThread();
  
    if (!strcmp("alertdisablecallback", aTopic)) {
@@ -99,7 +74,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
      // to the parent; `ContentParent::RecvDisableNotifications` will call
      // `RemovePermission`.
      ContentChild::GetSingleton()->SendDisableNotifications(
-       IPC::Principal(mPrincipal));
+         IPC::Principal(mPrincipal));
      return NS_OK;
 -  } else if (!strcmp("alertclickcallback", aTopic)) {
 -    Telemetry::Accumulate(Telemetry::WEB_NOTIFICATION_CLICKED, 1);
@@ -111,11 +86,11 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
      // `ContentParent::RecvOpenNotificationSettings` notifies observers in the
      // parent process.
      ContentChild::GetSingleton()->SendOpenNotificationSettings(
-       IPC::Principal(mPrincipal));
+         IPC::Principal(mPrincipal));
      return NS_OK;
-@@ -1393,21 +1384,16 @@ NotificationObserver::Observe(nsISupport
+@@ -1229,21 +1220,16 @@ NotificationObserver::Observe(nsISupport
      RefPtr<NotificationTelemetryService> telemetry =
-       NotificationTelemetryService::GetInstance();
+         NotificationTelemetryService::GetInstance();
      if (telemetry) {
        // Record whether "do not disturb" is supported after the first
        // notification, to account for falling back to XUL alerts.
@@ -132,9 +107,9 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
    return mObserver->Observe(aSubject, aTopic, aData);
  }
  
- nsresult
- NotificationObserver::AdjustPushQuota(const char* aTopic)
- {
+ nsresult NotificationObserver::AdjustPushQuota(const char* aTopic) {
+   nsCOMPtr<nsIPushQuotaManager> pushQuotaManager =
+       do_GetService("@mozilla.org/push/Service;1");
 diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/components/alerts/resources/content/alert.js
 --- a/toolkit/components/alerts/resources/content/alert.js
 +++ b/toolkit/components/alerts/resources/content/alert.js
@@ -160,7 +135,7 @@ diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/comp
 diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
 --- a/toolkit/components/telemetry/Histograms.json
 +++ b/toolkit/components/telemetry/Histograms.json
-@@ -12293,43 +12293,16 @@
+@@ -12259,43 +12259,16 @@
      "alert_emails": ["hkirschner@mozilla.com"],
      "bug_numbers": [1312881],
      "expires_in_version": "58",
@@ -173,8 +148,8 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
 -    "record_in_processes": ["main", "content"],
 -    "releaseChannelCollection": "opt-out",
 -    "alert_emails": ["firefox-dev@mozilla.org", "push@mozilla.com"],
--    "bug_numbers": [1225336],
--    "expires_in_version": "60",
+-    "bug_numbers": [1225336, 1429286],
+-    "expires_in_version": "never",
 -    "kind": "count",
 -    "description": "Count of times a web notification was clicked"
 -  },
@@ -191,8 +166,8 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
 -    "record_in_processes": ["main", "content"],
 -    "releaseChannelCollection": "opt-out",
 -    "alert_emails": ["firefox-dev@mozilla.org", "push@mozilla.com"],
--    "bug_numbers": [1225336],
--    "expires_in_version": "60",
+-    "bug_numbers": [1225336, 1429286],
+-    "expires_in_version": "never",
 -    "kind": "count",
 -    "description": "Count of times a Notification was rendered (accounting for XUL DND). A system backend may put the notification directly into the tray if its own DND is on."
 -  },
@@ -204,7 +179,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
      "high": 60000,
      "n_buckets": 50,
      "description": "Time to download a webfont (ms)"
-@@ -12419,34 +12392,16 @@
+@@ -12385,34 +12358,16 @@
    "ALERTS_SERVICE_DND_SUPPORTED_FLAG": {
      "record_in_processes": ["main", "content"],
      "alert_emails": ["firefox-dev@mozilla.org"],
@@ -225,15 +200,15 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
 -    "record_in_processes": ["main", "content"],
 -    "releaseChannelCollection": "opt-out",
 -    "alert_emails": ["firefox-dev@mozilla.org", "push@mozilla.com"],
--    "bug_numbers": [1219030],
--    "expires_in_version": "60",
+-    "bug_numbers": [1219030, 1429286],
+-    "expires_in_version": "never",
 -    "kind": "enumerated",
 -    "n_values": 10,
 -    "description": "Number of origins with the web notifications permission (0 = denied, 1 = allowed)."
 -  },
    "PLUGIN_DRAWING_MODEL": {
      "record_in_processes": ["main", "content"],
-     "alert_emails": ["danderson@mozilla.com"],
+     "alert_emails": ["gfx-telemetry-alerts@mozilla.com","msreckovic@mozilla.com"],
      "expires_in_version": "never",
      "kind": "enumerated",
      "bug_numbers": [1229961],
@@ -242,7 +217,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
 diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
 --- a/toolkit/components/telemetry/histogram-whitelists.json
 +++ b/toolkit/components/telemetry/histogram-whitelists.json
-@@ -2007,14 +2007,11 @@
+@@ -1699,14 +1699,11 @@
      "UPDATE_SERVICE_MANUALLY_UNINSTALLED_NOTIFY",
      "UPDATE_UNABLE_TO_APPLY_EXTERNAL",
      "UPDATE_UNABLE_TO_APPLY_NOTIFY",

comm-esr60/mozilla-esr60/patches/1591803-1only-72a1.patch → rel-257/mozilla-esr60/patches/1591803-1only-72a1.patch

@@ -2,7 +2,7 @@
 # User Ehsan Akhgari <ehsan@mozilla.com>
 # Date 1572314183 0
 # Node ID 8305d3ae226dac150ae3f1cb531466413ca56901
-# Parent  2b5b6aae2709686bdedc7611f1588c92863affe4
+# Parent  6a6f7dd2cc2396c7657903900d5d51e9d3186af2
 Bug 1591803 - Part 1: Remove the dead code in NotificationTelemetryService; r=johannh
 
 Differential Revision: https://phabricator.services.mozilla.com/D50752
@@ -10,58 +10,35 @@ Differential Revision: https://phabricator.services.mozilla.com/D50752
 diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
 --- a/dom/notification/Notification.cpp
 +++ b/dom/notification/Notification.cpp
-@@ -7,17 +7,16 @@
- #include "mozilla/dom/Notification.h"
- 
- #include "mozilla/Encoding.h"
- #include "mozilla/JSONWriter.h"
- #include "mozilla/Move.h"
- #include "mozilla/OwningNonNull.h"
- #include "mozilla/Preferences.h"
- #include "mozilla/Services.h"
--#include "mozilla/Telemetry.h"
- #include "mozilla/Unused.h"
- 
- #include "mozilla/dom/AppNotificationServiceOptionsBinding.h"
- #include "mozilla/dom/BindingUtils.h"
- #include "mozilla/dom/ContentChild.h"
- #include "mozilla/dom/NotificationEvent.h"
- #include "mozilla/dom/PermissionMessageUtils.h"
- #include "mozilla/dom/Promise.h"
-@@ -663,149 +662,16 @@ NS_IMETHODIMP
- NotificationPermissionRequest::GetTypes(nsIArray** aTypes)
- {
+@@ -587,135 +587,16 @@ nsresult NotificationPermissionRequest::
+ NS_IMETHODIMP
+ NotificationPermissionRequest::GetTypes(nsIArray** aTypes) {
    nsTArray<nsString> emptyOptions;
-   return nsContentPermissionUtils::CreatePermissionArray(NS_LITERAL_CSTRING("desktop-notification"),
-                                                          emptyOptions,
-                                                          aTypes);
+   return nsContentPermissionUtils::CreatePermissionArray(
+       NS_LITERAL_CSTRING("desktop-notification"),
+       emptyOptions, aTypes);
  }
  
 -NS_IMPL_ISUPPORTS(NotificationTelemetryService, nsIObserver)
 -
 -NotificationTelemetryService::NotificationTelemetryService()
--  : mDNDRecorded(false)
--{}
+-    : mDNDRecorded(false) {}
 -
--NotificationTelemetryService::~NotificationTelemetryService()
--{}
+-NotificationTelemetryService::~NotificationTelemetryService() {}
 -
 -/* static */ already_AddRefed<NotificationTelemetryService>
--NotificationTelemetryService::GetInstance()
--{
+-NotificationTelemetryService::GetInstance() {
 -  nsCOMPtr<nsISupports> telemetrySupports =
--    do_GetService(NOTIFICATIONTELEMETRYSERVICE_CONTRACTID);
+-      do_GetService(NOTIFICATIONTELEMETRYSERVICE_CONTRACTID);
 -  if (!telemetrySupports) {
 -    return nullptr;
 -  }
 -  RefPtr<NotificationTelemetryService> telemetry =
--    static_cast<NotificationTelemetryService*>(telemetrySupports.get());
+-      static_cast<NotificationTelemetryService*>(telemetrySupports.get());
 -  return telemetry.forget();
 -}
 -
--nsresult
--NotificationTelemetryService::Init()
--{
+-nsresult NotificationTelemetryService::Init() {
 -  // Only perform permissions telemetry collection in the parent process.
 -  if (!XRE_IsParentProcess()) {
 -    return NS_OK;
@@ -72,9 +49,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
 -  return NS_OK;
 -}
 -
--void
--NotificationTelemetryService::RecordPermissions()
--{
+-void NotificationTelemetryService::RecordPermissions() {
 -  MOZ_ASSERT(XRE_IsParentProcess(),
 -             "RecordPermissions may only be called in the parent process");
 -
@@ -83,7 +58,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
 -  }
 -
 -  nsCOMPtr<nsIPermissionManager> permissionManager =
--    services::GetPermissionManager();
+-      services::GetPermissionManager();
 -  if (!permissionManager) {
 -    return;
 -  }
@@ -115,10 +90,8 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
 -  }
 -}
 -
--bool
--NotificationTelemetryService::GetNotificationPermission(nsISupports* aSupports,
--                                                        uint32_t* aCapability)
--{
+-bool NotificationTelemetryService::GetNotificationPermission(
+-    nsISupports* aSupports, uint32_t* aCapability) {
 -  nsCOMPtr<nsIPermission> permission = do_QueryInterface(aSupports);
 -  if (!permission) {
 -    return false;
@@ -132,21 +105,19 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
 -  return true;
 -}
 -
--void
--NotificationTelemetryService::RecordDNDSupported()
--{
+-void NotificationTelemetryService::RecordDNDSupported() {
 -  if (mDNDRecorded) {
 -    return;
 -  }
 -
 -  nsCOMPtr<nsIAlertsService> alertService =
--    do_GetService(NS_ALERTSERVICE_CONTRACTID);
+-      do_GetService(NS_ALERTSERVICE_CONTRACTID);
 -  if (!alertService) {
 -    return;
 -  }
 -
 -  nsCOMPtr<nsIAlertsDoNotDisturb> alertServiceDND =
--    do_QueryInterface(alertService);
+-      do_QueryInterface(alertService);
 -  if (!alertServiceDND) {
 -    return;
 -  }
@@ -158,37 +129,34 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
 -    return;
 -  }
 -
--  Telemetry::Accumulate(
--    Telemetry::ALERTS_SERVICE_DND_SUPPORTED_FLAG, true);
+-  Telemetry::Accumulate(Telemetry::ALERTS_SERVICE_DND_SUPPORTED_FLAG, true);
 -}
 -
 -NS_IMETHODIMP
--NotificationTelemetryService::Observe(nsISupports* aSubject,
--                                      const char* aTopic,
--                                      const char16_t* aData)
--{
+-NotificationTelemetryService::Observe(nsISupports* aSubject, const char* aTopic,
+-                                      const char16_t* aData) {
 -  return NS_OK;
 -}
 -
- // Observer that the alert service calls to do common tasks and/or dispatch to the
- // specific observer for the context e.g. main thread, worker, or service worker.
- class NotificationObserver final : public nsIObserver
- {
- public:
+ // Observer that the alert service calls to do common tasks and/or dispatch to
+ // the specific observer for the context e.g. main thread, worker, or service
+ // worker.
+ class NotificationObserver final : public nsIObserver {
+  public:
    nsCOMPtr<nsIObserver> mObserver;
    nsCOMPtr<nsIPrincipal> mPrincipal;
    bool mInPrivateBrowsing;
-@@ -1376,23 +1242,16 @@ NotificationObserver::Observe(nsISupport
+@@ -1212,23 +1093,16 @@ NotificationObserver::Observe(nsISupport
+       return Notification::OpenSettings(mPrincipal);
      }
      // `ContentParent::RecvOpenNotificationSettings` notifies observers in the
      // parent process.
      ContentChild::GetSingleton()->SendOpenNotificationSettings(
-       IPC::Principal(mPrincipal));
+         IPC::Principal(mPrincipal));
      return NS_OK;
-   } else if (!strcmp("alertshow", aTopic) ||
-              !strcmp("alertfinished", aTopic)) {
+   } else if (!strcmp("alertshow", aTopic) || !strcmp("alertfinished", aTopic)) {
 -    RefPtr<NotificationTelemetryService> telemetry =
--      NotificationTelemetryService::GetInstance();
+-        NotificationTelemetryService::GetInstance();
 -    if (telemetry) {
 -      // Record whether "do not disturb" is supported after the first
 -      // notification, to account for falling back to XUL alerts.
@@ -200,12 +168,12 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
    return mObserver->Observe(aSubject, aTopic, aData);
  }
  
- nsresult
- NotificationObserver::AdjustPushQuota(const char* aTopic)
+ nsresult NotificationObserver::AdjustPushQuota(const char* aTopic) {
+   nsCOMPtr<nsIPushQuotaManager> pushQuotaManager =
 diff --git a/dom/notification/Notification.h b/dom/notification/Notification.h
 --- a/dom/notification/Notification.h
 +++ b/dom/notification/Notification.h
-@@ -14,19 +14,16 @@
+@@ -15,19 +15,16 @@
  #include "nsIObserver.h"
  #include "nsISupports.h"
  
@@ -225,20 +193,19 @@ diff --git a/dom/notification/Notification.h b/dom/notification/Notification.h
  
  class NotificationRef;
  class WorkerNotificationObserver;
-@@ -45,41 +42,16 @@ class NotificationWorkerHolder final : p
+@@ -41,39 +38,16 @@ class NotificationWorkerHolder final : p
+   Notification* mNotification;
  
- public:
+  public:
    explicit NotificationWorkerHolder(Notification* aNotification);
  
-   bool
-   Notify(workers::Status aStatus) override;
+   bool Notify(WorkerStatus aStatus) override;
  };
  
 -// Records telemetry probes at application startup, when a notification is
 -// shown, and when the notification permission is revoked for a site.
--class NotificationTelemetryService final : public nsIObserver
--{
--public:
+-class NotificationTelemetryService final : public nsIObserver {
+- public:
 -  NS_DECL_ISUPPORTS
 -  NS_DECL_NSIOBSERVER
 -
@@ -250,11 +217,10 @@ diff --git a/dom/notification/Notification.h b/dom/notification/Notification.h
 -  void RecordDNDSupported();
 -  void RecordPermissions();
 -
--private:
+- private:
 -  virtual ~NotificationTelemetryService();
 -
--  bool GetNotificationPermission(nsISupports* aSupports,
--                                 uint32_t* aCapability);
+-  bool GetNotificationPermission(nsISupports* aSupports, uint32_t* aCapability);
 -
 -  bool mDNDRecorded;
 -};
@@ -267,7 +233,7 @@ diff --git a/dom/notification/Notification.h b/dom/notification/Notification.h
   *   and a feature should be added to observe the worker lifetime. This main
   *   thread owner should ensure it properly releases the reference to the
   *   Notification, additionally removing the feature if necessary.
-@@ -134,17 +106,16 @@ class Notification : public DOMEventTarg
+@@ -127,17 +101,16 @@ class Notification : public DOMEventTarg
    friend class CloseNotificationRunnable;
    friend class NotificationTask;
    friend class NotificationPermissionRequest;
@@ -278,7 +244,7 @@ diff --git a/dom/notification/Notification.h b/dom/notification/Notification.h
    friend class WorkerNotificationObserver;
 -  friend class NotificationTelemetryService;
  
- public:
+  public:
    IMPL_EVENT_HANDLER(click)
    IMPL_EVENT_HANDLER(show)
    IMPL_EVENT_HANDLER(error)
@@ -288,41 +254,45 @@ diff --git a/dom/notification/Notification.h b/dom/notification/Notification.h
 diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
 --- a/layout/build/nsLayoutCID.h
 +++ b/layout/build/nsLayoutCID.h
-@@ -73,12 +73,9 @@
- // {5a75c25a-5e7e-4d90-8f7c-07eb15cc0aa8}
- #define QUOTAMANAGER_SERVICE_CID \
- { 0x5a75c25a, 0x5e7e, 0x4d90, { 0x8f, 0x7c, 0x07, 0xeb, 0x15, 0xcc, 0x0a, 0xa8 } }
- 
+@@ -145,16 +145,9 @@
  // {c74bde32-bcc7-4840-8430-c733351b212a}
- #define SERVICEWORKERMANAGER_CID \
- { 0xc74bde32, 0xbcc7, 0x4840, { 0x84, 0x30, 0xc7, 0x33, 0x35, 0x1b, 0x21, 0x2a } }
+ #define SERVICEWORKERMANAGER_CID                     \
+   {                                                  \
+     0xc74bde32, 0xbcc7, 0x4840, {                    \
+       0x84, 0x30, 0xc7, 0x33, 0x35, 0x1b, 0x21, 0x2a \
+     }                                                \
+   }
  
--#define NOTIFICATIONTELEMETRYSERVICE_CID \
--{ 0x5995b782, 0x6a0e, 0x4066, { 0xaa, 0xc5, 0x27, 0x6f, 0x0a, 0x9a, 0xd8, 0xcf } }
+-#define NOTIFICATIONTELEMETRYSERVICE_CID             \
+-  {                                                  \
+-    0x5995b782, 0x6a0e, 0x4066, {                    \
+-      0xaa, 0xc5, 0x27, 0x6f, 0x0a, 0x9a, 0xd8, 0xcf \
+-    }                                                \
+-  }
 -
  #endif /* nsLayoutCID_h__ */
 diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
 --- a/layout/build/nsLayoutModule.cpp
 +++ b/layout/build/nsLayoutModule.cpp
-@@ -185,17 +185,16 @@ static void Shutdown();
+@@ -181,17 +181,16 @@ static void Shutdown();
+ #include "mozilla/dom/PresentationTCPSessionTransport.h"
+ 
+ #include "nsScriptError.h"
+ 
+ #include "mozilla/TextInputProcessor.h"
+ 
  using namespace mozilla;
  using namespace mozilla::dom;
+-using mozilla::dom::NotificationTelemetryService;
+ using mozilla::dom::UDPSocketChild;
+ using mozilla::dom::WorkerDebuggerManager;
  using mozilla::dom::power::PowerManagerService;
  using mozilla::dom::quota::QuotaManagerService;
- using mozilla::dom::workers::ServiceWorkerManager;
- using mozilla::dom::workers::WorkerDebuggerManager;
- using mozilla::dom::UDPSocketChild;
  using mozilla::gmp::GeckoMediaPluginService;
--using mozilla::dom::NotificationTelemetryService;
  
- #define NS_EDITORCOMMANDTABLE_CID \
- { 0x4f5e62b8, 0xd659, 0x4156, \
-   { 0x84, 0xfc, 0x2f, 0x60, 0x99, 0x40, 0x03, 0x69 } }
- 
- #define NS_EDITINGCOMMANDTABLE_CID \
- { 0xcb38a746, 0xbeb8, 0x43f3, \
-   { 0x94, 0x29, 0x77, 0x96, 0xe1, 0xa9, 0x3f, 0xb4 } }
-@@ -269,17 +268,16 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR
+ #define NS_EDITORCOMMANDTABLE_CID                    \
+   {                                                  \
+@@ -283,17 +282,16 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR
  
  NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIMediaManagerService,
                                           MediaManager::GetInstance)
@@ -340,11 +310,11 @@ diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
  
  // Perform our one-time intialization for this module
  
-@@ -613,17 +611,16 @@ NS_DEFINE_NAMED_CID(NS_XMLHTTPREQUEST_CI
+@@ -636,17 +634,16 @@ NS_DEFINE_NAMED_CID(NS_XMLSERIALIZER_CID
+ NS_DEFINE_NAMED_CID(NS_HOSTOBJECTURI_CID);
  NS_DEFINE_NAMED_CID(NS_DOMPARSER_CID);
  NS_DEFINE_NAMED_CID(NS_DOMSESSIONSTORAGEMANAGER_CID);
  NS_DEFINE_NAMED_CID(NS_DOMLOCALSTORAGEMANAGER_CID);
- NS_DEFINE_NAMED_CID(NS_DOMJSON_CID);
  NS_DEFINE_NAMED_CID(NS_TEXTEDITOR_CID);
  NS_DEFINE_NAMED_CID(DOMREQUEST_SERVICE_CID);
  NS_DEFINE_NAMED_CID(QUOTAMANAGER_SERVICE_CID);
@@ -358,11 +328,11 @@ diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
  NS_DEFINE_NAMED_CID(NS_EDITINGCONTROLLER_CID);
  NS_DEFINE_NAMED_CID(NS_EDITORCOMMANDTABLE_CID);
  NS_DEFINE_NAMED_CID(NS_EDITINGCOMMANDTABLE_CID);
-@@ -870,17 +867,16 @@ static const mozilla::Module::CIDEntry k
-   { &kNS_XPCEXCEPTION_CID, false, nullptr, ExceptionConstructor },
+@@ -884,17 +881,16 @@ static const mozilla::Module::CIDEntry k
+   { &kNS_HOSTOBJECTURI_CID, false, nullptr, nsHostObjectURIConstructor },
+   { &kNS_DOMPARSER_CID, false, nullptr, DOMParserConstructor },
    { &kNS_DOMSESSIONSTORAGEMANAGER_CID, false, nullptr, SessionStorageManagerConstructor },
    { &kNS_DOMLOCALSTORAGEMANAGER_CID, false, nullptr, LocalStorageManagerConstructor },
-   { &kNS_DOMJSON_CID, false, nullptr, NS_NewJSON },
    { &kNS_TEXTEDITOR_CID, false, nullptr, TextEditorConstructor },
    { &kDOMREQUEST_SERVICE_CID, false, nullptr, DOMRequestServiceConstructor },
    { &kQUOTAMANAGER_SERVICE_CID, false, nullptr, QuotaManagerServiceConstructor },
@@ -376,11 +346,11 @@ diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
    { &kNS_EDITINGCONTROLLER_CID, false, nullptr, nsEditingControllerConstructor },
    { &kNS_EDITORCOMMANDTABLE_CID, false, nullptr, nsEditorCommandTableConstructor },
    { &kNS_EDITINGCOMMANDTABLE_CID, false, nullptr, nsEditingCommandTableConstructor },
-@@ -995,17 +991,16 @@ static const mozilla::Module::ContractID
+@@ -1001,17 +997,16 @@ static const mozilla::Module::ContractID
+   { "@mozilla.org/dom/localStorage-manager;1", &kNS_DOMLOCALSTORAGEMANAGER_CID },
    // Keeping the old ContractID for backward compatibility
    { "@mozilla.org/dom/storagemanager;1", &kNS_DOMLOCALSTORAGEMANAGER_CID },
    { "@mozilla.org/dom/sessionStorage-manager;1", &kNS_DOMSESSIONSTORAGEMANAGER_CID },
-   { "@mozilla.org/dom/json;1", &kNS_DOMJSON_CID },
    { "@mozilla.org/editor/texteditor;1", &kNS_TEXTEDITOR_CID },
    { DOMREQUEST_SERVICE_CONTRACTID, &kDOMREQUEST_SERVICE_CID },
    { QUOTAMANAGER_SERVICE_CONTRACTID, &kQUOTAMANAGER_SERVICE_CID },
@@ -392,9 +362,9 @@ diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
    { "@mozilla.org/editor/htmleditor;1", &kNS_HTMLEDITOR_CID },
    { "@mozilla.org/editor/editorcontroller;1", &kNS_EDITORCONTROLLER_CID },
    { "@mozilla.org/editor/editingcontroller;1", &kNS_EDITINGCONTROLLER_CID },
-   { "@mozilla.org/textservices/textservicesdocument;1", &kNS_TEXTSERVICESDOCUMENT_CID },
    { "@mozilla.org/geolocation/service;1", &kNS_GEOLOCATION_SERVICE_CID },
-@@ -1065,17 +1060,16 @@ static const mozilla::Module::CategoryEn
+   { "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID },
+@@ -1070,17 +1065,16 @@ static const mozilla::Module::CategoryEn
    { "net-channel-event-sinks", NS_MIXEDCONTENTBLOCKER_CONTRACTID, NS_MIXEDCONTENTBLOCKER_CONTRACTID },
    { "app-startup", "Script Security Manager", "service," NS_SCRIPTSECURITYMANAGER_CONTRACTID },
    { "app-startup", "Push Notifier", "service," PUSHNOTIFIER_CONTRACTID },
@@ -405,13 +375,13 @@ diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
    { "profile-after-change", "PresentationService", PRESENTATION_SERVICE_CONTRACTID },
 -  { "profile-after-change", "Notification Telemetry Service", NOTIFICATIONTELEMETRYSERVICE_CONTRACTID },
    { nullptr }
+     // clang-format on
  };
  
- static void
- LayoutModuleDtor()
- {
+ static void LayoutModuleDtor() {
    if (XRE_GetProcessType() == GeckoProcessType_GPU) {
      return;
+   }
 diff --git a/toolkit/components/alerts/nsXULAlerts.cpp b/toolkit/components/alerts/nsXULAlerts.cpp
 --- a/toolkit/components/alerts/nsXULAlerts.cpp
 +++ b/toolkit/components/alerts/nsXULAlerts.cpp
@@ -430,13 +400,13 @@ diff --git a/toolkit/components/alerts/nsXULAlerts.cpp b/toolkit/components/aler
  
  namespace {
  StaticRefPtr<nsXULAlerts> gXULAlerts;
- } // anonymous namespace
+ }  // anonymous namespace
  
  NS_IMPL_CYCLE_COLLECTION(nsXULAlertObserver, mAlertWindow)
 diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
 --- a/toolkit/components/telemetry/Histograms.json
 +++ b/toolkit/components/telemetry/Histograms.json
-@@ -12384,24 +12384,16 @@
+@@ -12350,24 +12350,16 @@
    "ALERTS_SERVICE_DND_ENABLED": {
      "record_in_processes": ["main", "content"],
      "alert_emails": ["firefox-dev@mozilla.org"],
@@ -455,7 +425,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
 -  },
    "PLUGIN_DRAWING_MODEL": {
      "record_in_processes": ["main", "content"],
-     "alert_emails": ["danderson@mozilla.com"],
+     "alert_emails": ["gfx-telemetry-alerts@mozilla.com","msreckovic@mozilla.com"],
      "expires_in_version": "never",
      "kind": "enumerated",
      "bug_numbers": [1229961],
@@ -464,7 +434,7 @@ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/t
 diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
 --- a/toolkit/components/telemetry/histogram-whitelists.json
 +++ b/toolkit/components/telemetry/histogram-whitelists.json
-@@ -1749,17 +1749,16 @@
+@@ -1497,17 +1497,16 @@
      "GEOLOCATION_WIN8_SOURCE_IS_MLS"
    ],
    "kind": [

rel-257/mozilla-esr60/patches/series

@@ -104,3 +104,5 @@ NOBUG-0c5f5c2e2a86-64a1.patch
 1394825-67a1.patch
 1546693-68a1.patch
 1557547-69a1.patch
+1429016-67a1.patch
+1591803-1only-72a1.patch