Merge inbound to mozilla-central. a=merge
authorOana Pop Rus <opoprus@mozilla.com>
Tue, 16 Apr 2019 12:49:28 +0300
changeset 528432 a17f163841e956c10eb74cdbe27d7073facf6b7f
parent 528430 fe4a28a68cfc2af8bc74a74ff6ae5c4dbded423a (current diff)
parent 528431 d64e4d9400ec8edd9959e63a07f584a66df054cd (diff)
child 528455 297c31b96b6e409fb40d22c26ab0b4fd6d87732a
child 528476 c292720195998d40736739ed6ddf89d18905cae2
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone68.0a1
first release with
nightly linux32
a17f163841e9 / 68.0a1 / 20190416095014 / files
nightly linux64
a17f163841e9 / 68.0a1 / 20190416095014 / files
nightly mac
a17f163841e9 / 68.0a1 / 20190416095014 / files
nightly win32
a17f163841e9 / 68.0a1 / 20190416095014 / files
nightly win64
a17f163841e9 / 68.0a1 / 20190416095014 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/dom/localstorage/ActorsParent.cpp
+++ b/dom/localstorage/ActorsParent.cpp
@@ -7682,17 +7682,17 @@ nsresult QuotaClient::InitOrigin(Persist
 
       rv = usageJournalFile->Remove(false);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         REPORT_TELEMETRY_INIT_ERR(kExternalError, LS_Remove3);
         return rv;
       }
     }
 
-    MOZ_ASSERT(usage >= 0);
+    MOZ_DIAGNOSTIC_ASSERT(usage >= 0);
 
     InitUsageForOrigin(aOrigin, usage);
 
     aUsageInfo->AppendToDatabaseUsage(uint64_t(usage));
   } else if (usageFileExists) {
     rv = usageFile->Remove(false);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       REPORT_TELEMETRY_INIT_ERR(kExternalError, LS_Remove4);