import changes from tenfourfox:

- additional adblock hosts (7d2b3ba88)
- M1477632 (86bc80d50)
- #334: get around a Telemetry stub crash by disabling MOAR TELEMETRY (e3663e02b)

caps/nsScriptSecurityManager.cpp

@@ -1101,6 +1101,7 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
                 BLOK("collector.cint.com") ||
 
                 BLOK("dpm.demdex.net") ||
+                BLOK("nbcu.demdex.net") ||
 
                 BLOK("www.uciservice.com") ||
 
@@ -1128,6 +1129,16 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
 
                 BLOK("p.d.1emn.com") ||
                 BLOK("p.w.1emn.com") ||
+
+                BLOK("ak.sail-horizon.com") ||
+                BLOK("api.sail-personalize.com") ||
+
+                BLOK("st.dynamicyield.com") ||
+                BLOK("px.dynamicyield.com") ||
+
+                BLOK("nervoussummer.com") ||
+
+                BLOK("usasync01.admantx.com") ||
                     0) {
 #undef BLOK
                 // Yup.

toolkit/components/telemetry/Telemetry.cpp

@@ -3882,6 +3882,8 @@ SetHistogramRecordingEnabled(ID aID, bool aEnabled)
 void
 Accumulate(ID aHistogram, uint32_t aSample)
 {
+return;
+/*
   if (!TelemetryImpl::CanRecordBase()) {
     return;
   }
@@ -3890,11 +3892,14 @@ Accumulate(ID aHistogram, uint32_t aSample)
   if (NS_SUCCEEDED(rv)) {
     HistogramAdd(*h, aSample, gHistograms[aHistogram].dataset);
   }
+*/
 }
 
 void
 Accumulate(ID aID, const nsCString& aKey, uint32_t aSample)
 {
+return;
+/*
   if (!TelemetryImpl::CanRecordBase()) {
     return;
   }
@@ -3902,11 +3907,14 @@ Accumulate(ID aID, const nsCString& aKey, uint32_t aSample)
   KeyedHistogram* keyed = TelemetryImpl::GetKeyedHistogramById(nsDependentCString(th.id()));
   MOZ_ASSERT(keyed);
   keyed->Add(aKey, aSample);
+*/
 }
 
 void
 Accumulate(const char* name, uint32_t sample)
 {
+return;
+/*
   if (!TelemetryImpl::CanRecordBase()) {
     return;
   }
@@ -3921,11 +3929,14 @@ Accumulate(const char* name, uint32_t sample)
   if (NS_SUCCEEDED(rv)) {
     HistogramAdd(*h, sample, gHistograms[id].dataset);
   }
+*/
 }
 
 void
 Accumulate(const char *name, const nsCString& key, uint32_t sample)
 {
+return;
+/*
     if (!TelemetryImpl::CanRecordBase()) {
       return;
     }
@@ -3934,25 +3945,29 @@ Accumulate(const char *name, const nsCString& key, uint32_t sample)
     if (NS_SUCCEEDED(rv)) {
       Accumulate(id, key, sample);
     }
+*/
 }
 
 void
 AccumulateTimeDelta(ID aHistogram, TimeStamp start, TimeStamp end)
 {
+return;
+/*
   Accumulate(aHistogram,
              static_cast<uint32_t>((end - start).ToMilliseconds()));
+*/
 }
 
 bool
 CanRecordBase()
 {
-  return TelemetryImpl::CanRecordBase();
+  return false; // TelemetryImpl::CanRecordBase();
 }
 
 bool
 CanRecordExtended()
 {
-  return TelemetryImpl::CanRecordExtended();
+  return false; // TelemetryImpl::CanRecordExtended();
 }
 
 base::Histogram*
@@ -3975,14 +3990,18 @@ RecordSlowSQLStatement(const nsACString &statement,
                        const nsACString &dbName,
                        uint32_t delay)
 {
+/*
   TelemetryImpl::RecordSlowStatement(statement, dbName, delay);
+*/
 }
 
 void
 RecordWebrtcIceCandidates(const uint32_t iceCandidateBitmask,
                           const bool success, const bool loop)
 {
+/*
   TelemetryImpl::RecordIceCandidates(iceCandidateBitmask, success, loop);
+*/
 }
 
 void Init()
@@ -4348,7 +4367,7 @@ NSMODULE_DEFN(nsTelemetryModule) = &kTelemetryModule;
 void
 XRE_TelemetryAccumulate(int aID, uint32_t aSample)
 {
-  mozilla::Telemetry::Accumulate((mozilla::Telemetry::ID) aID, aSample);
+//  mozilla::Telemetry::Accumulate((mozilla::Telemetry::ID) aID, aSample);
 }
 
 KeyedHistogram::KeyedHistogram(const nsACString &name, const nsACString &expiration,

xpcom/glue/PLDHashTable.cpp

@@ -387,7 +387,7 @@ PLDHashTable::Clear()
 // distinction is a bit grotty but this function is hot enough that these
 // differences are worthwhile.
 template <PLDHashTable::SearchReason Reason>
-PLDHashEntryHdr* PL_DHASH_FASTCALL
+MOZ_ALWAYS_INLINE PLDHashEntryHdr*
 PLDHashTable::SearchTable(const void* aKey, PLDHashNumber aKeyHash)
 {
   MOZ_ASSERT(mEntryStore.Get());