diff --git a/mobile/android/themes/core/aboutLogins.css b/mobile/android/themes/core/aboutLogins.css
index 53933585738a..6a747262b966 100644
--- a/mobile/android/themes/core/aboutLogins.css
+++ b/mobile/android/themes/core/aboutLogins.css
@@ -184,3 +184,15 @@ body {
background-image: url("resource://android/res/drawable-xhdpi-v4/favicon_globe.png");
}
}
+
+#loading-img-container{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+#spinner {
+ margin-top: 60px;
+ height: 60px;
+ width: 60px;
+}
diff --git a/mobile/android/themes/core/images/spinning_throbber.svg b/mobile/android/themes/core/images/spinning_throbber.svg
new file mode 100644
index 000000000000..5f478205ce32
--- /dev/null
+++ b/mobile/android/themes/core/images/spinning_throbber.svg
@@ -0,0 +1,61 @@
+
+
+
+
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index 93ffcce24326..5ece7981a76a 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -45,6 +45,7 @@ chrome.jar:
#ifdef NIGHTLY_BUILD
* skin/aboutLogins.css (aboutLogins.css)
+ skin/images/spinning_throbber.svg (images/spinning_throbber.svg)
#endif
skin/images/search.png (images/search.png)
diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp
index 44ffbdf4d0ac..a343100bbbc9 100644
--- a/netwerk/dns/nsHostResolver.cpp
+++ b/netwerk/dns/nsHostResolver.cpp
@@ -471,15 +471,6 @@ HostDB_ClearEntry(PLDHashTable *table,
}
}
#endif
-
- {
- MutexAutoLock lock(he->rec->addr_info_lock);
- if (he->rec->addr_info) {
- delete hr->addr_info;
- he->rec->addr_info = nullptr;
- }
- }
-
NS_RELEASE(he->rec);
}
@@ -862,12 +853,8 @@ nsHostResolver::ResolveHost(const char *host,
LOG((" Trying AF_UNSPEC entry for host [%s%s%s] af: %s.\n",
LOG_HOST(host, netInterface),
(af == PR_AF_INET) ? "AF_INET" : "AF_INET6"));
- // Ensure existing `addr_info` in `he` is cleared before
- // copying from `unSpecHe`.
- if (he->rec->addr_info) {
- delete he->rec->addr_info;
- he->rec->addr_info = nullptr;
- }
+
+ he->rec->addr_info = nullptr;
if (unspecHe->rec->negative) {
he->rec->negative = unspecHe->rec->negative;
he->rec->CopyExpirationTimesAndFlagsFrom(unspecHe->rec);
diff --git a/services/fxaccounts/FxAccountsWebChannel.jsm b/services/fxaccounts/FxAccountsWebChannel.jsm
index 10247bb244fe..f1163890ec40 100644
--- a/services/fxaccounts/FxAccountsWebChannel.jsm
+++ b/services/fxaccounts/FxAccountsWebChannel.jsm
@@ -9,7 +9,7 @@
* about account state changes.
*/
-this.EXPORTED_SYMBOLS = ["FxAccountsWebChannel"];
+this.EXPORTED_SYMBOLS = ["EnsureFxAccountsWebChannel"];
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
@@ -311,3 +311,21 @@ this.FxAccountsWebChannelHelpers.prototype = {
return pressed === 0; // 0 is the "continue" button
}
};
+
+let singleton;
+// The entry-point for this module, which ensures only one of our channels is
+// ever created - we require this because the WebChannel is global in scope
+// (eg, it uses the observer service to tell interested parties of interesting
+// things) and allowing multiple channels would cause such notifications to be
+// sent multiple times.
+this.EnsureFxAccountsWebChannel = function() {
+ if (!singleton) {
+ let contentUri = Services.urlFormatter.formatURLPref("identity.fxaccounts.remote.webchannel.uri");
+ // The FxAccountsWebChannel listens for events and updates
+ // the state machine accordingly.
+ singleton = new this.FxAccountsWebChannel({
+ content_uri: contentUri,
+ channel_id: WEBCHANNEL_ID,
+ });
+ }
+}
diff --git a/testing/mozharness/mozharness.json b/testing/mozharness/mozharness.json
index 8136b3f1d9c3..a3f867f3e1bd 100644
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
{
"repo": "https://hg.mozilla.org/build/mozharness",
- "revision": "239491bc393a"
+ "revision": "565f7f26ec17"
}
diff --git a/toolkit/content/widgets/tabbox.xml b/toolkit/content/widgets/tabbox.xml
index 9ec4817c4cba..8f6549eced2d 100644
--- a/toolkit/content/widgets/tabbox.xml
+++ b/toolkit/content/widgets/tabbox.xml
@@ -727,6 +727,11 @@
+