summaryrefslogtreecommitdiffstats
path: root/uriloader/prefetch
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-08 10:49:03 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-08 10:49:03 +0100
commit60c83971fb19dea49beab3a02c8913f75f62ad09 (patch)
tree90b3528a725b148a1e05f3a5a520ca3d336ca0d9 /uriloader/prefetch
parentaff468a486995dd7a31aca182666aeb6da713467 (diff)
downloadUXP-60c83971fb19dea49beab3a02c8913f75f62ad09.tar
UXP-60c83971fb19dea49beab3a02c8913f75f62ad09.tar.gz
UXP-60c83971fb19dea49beab3a02c8913f75f62ad09.tar.lz
UXP-60c83971fb19dea49beab3a02c8913f75f62ad09.tar.xz
UXP-60c83971fb19dea49beab3a02c8913f75f62ad09.zip
Issue #1263 - Part 1: Remove DiskSpaceWatcher
Diffstat (limited to 'uriloader/prefetch')
-rw-r--r--uriloader/prefetch/nsOfflineCacheUpdate.h1
-rw-r--r--uriloader/prefetch/nsOfflineCacheUpdateService.cpp32
2 files changed, 1 insertions, 32 deletions
diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.h b/uriloader/prefetch/nsOfflineCacheUpdate.h
index 4ccba4135..2e6d6d30c 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdate.h
+++ b/uriloader/prefetch/nsOfflineCacheUpdate.h
@@ -375,7 +375,6 @@ private:
bool mDisabled;
bool mUpdateRunning;
- bool mLowFreeSpace;
};
#endif
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
index adb3fd516..6a67af013 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
@@ -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;
}