Backing out bug 916052 (2557b51a47a0) for build bustage on linux/osx, r=bustage on CLOSED TREE

This commit is contained in:
Honza Bambas
2014-04-30 13:05:43 +02:00
parent a3fb819588
commit 363e4d697a
34 changed files with 579 additions and 1641 deletions

View File

@@ -6,7 +6,6 @@
#define CacheFileIOManager__h__
#include "CacheIOThread.h"
#include "CacheStorageService.h"
#include "nsIEventTarget.h"
#include "nsITimer.h"
#include "nsCOMPtr.h"
@@ -23,7 +22,6 @@ class nsIFile;
class nsITimer;
class nsIDirectoryEnumerator;
class nsILoadContextInfo;
class nsICacheStorageVisitor;
namespace mozilla {
namespace net {
@@ -280,13 +278,6 @@ public:
static void GetCacheDirectory(nsIFile** result);
// Calls synchronously OnEntryInfo for an entry with the given hash.
// Tries to find an existing entry in the service hashtables first, if not
// found, loads synchronously from disk file.
// Callable on the IO thread only.
static nsresult GetEntryInfo(const SHA1Sum::Hash *aHash,
CacheStorageService::EntryInfoCallback *aCallback);
// Memory reporting
static size_t SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf);
static size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf);