Issue #1263 - Part 1: Remove DiskSpaceWatcher

This commit is contained in:
wolfbeast 2019-11-08 10:49:03 +01:00 committed by Roy Tam
commit 92b01bf08a
20 changed files with 3 additions and 537 deletions

View file

@ -39,7 +39,6 @@
#include "mozilla/Preferences.h"
#include "mozilla/Attributes.h"
#include "mozilla/Unused.h"
#include "nsIDiskSpaceWatcher.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeOwner.h"
@ -246,7 +245,6 @@ NS_IMPL_ISUPPORTS(nsOfflineCacheUpdateService,
nsOfflineCacheUpdateService::nsOfflineCacheUpdateService()
: mDisabled(false)
, mUpdateRunning(false)
, mLowFreeSpace(false)
{
MOZ_ASSERT(NS_IsMainThread());
Preferences::AddBoolVarCache(&sAllowOfflineCache,
@ -273,19 +271,6 @@ nsOfflineCacheUpdateService::Init()
true);
NS_ENSURE_SUCCESS(rv, rv);
// Get the current status of the disk in terms of free space and observe
// low device storage notifications.
nsCOMPtr<nsIDiskSpaceWatcher> diskSpaceWatcherService =
do_GetService("@mozilla.org/toolkit/disk-space-watcher;1");
if (diskSpaceWatcherService) {
diskSpaceWatcherService->GetIsDiskFull(&mLowFreeSpace);
} else {
NS_WARNING("Could not get disk status from nsIDiskSpaceWatcher");
}
rv = observerService->AddObserver(this, "disk-space-watcher", false);
NS_ENSURE_SUCCESS(rv, rv);
gOfflineCacheUpdateService = this;
return NS_OK;
@ -407,11 +392,7 @@ nsOfflineCacheUpdateService::ProcessNextUpdate()
if (mUpdates.Length() > 0) {
mUpdateRunning = true;
// Canceling the update before Begin() call will make the update
// asynchronously finish with an error.
if (mLowFreeSpace) {
mUpdates[0]->Cancel();
}
return mUpdates[0]->Begin();
}
@ -582,17 +563,6 @@ nsOfflineCacheUpdateService::Observe(nsISupports *aSubject,
mDisabled = true;
}
if (!strcmp(aTopic, "disk-space-watcher")) {
if (NS_LITERAL_STRING("full").Equals(aData)) {
mLowFreeSpace = true;
for (uint32_t i = 0; i < mUpdates.Length(); i++) {
mUpdates[i]->Cancel();
}
} else if (NS_LITERAL_STRING("free").Equals(aData)) {
mLowFreeSpace = false;
}
}
return NS_OK;
}