gecko/netwerk/cache2/OldWrappers.h
Ehsan Akhgari b6e35bb4b4 Bug 1118486 - Part 1: Use = delete instead of MOZ_DELETE directly; r=Waldo
Most of this patch (with the exception of dom/bindings/Codegen.py) was
generated by the following bash script:

#!/bin/bash

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "*/.git*" \
       ! -wholename "obj-*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_DELETE '= delete'
2015-01-08 23:19:05 -05:00

269 lines
7.9 KiB
C++

// Stuff to link the old imp to the new api - will go away!
#ifndef OLDWRAPPERS__H__
#define OLDWRAPPERS__H__
#include "nsICacheEntry.h"
#include "nsICacheListener.h"
#include "nsICacheStorage.h"
#include "nsCOMPtr.h"
#include "nsICacheEntryOpenCallback.h"
#include "nsICacheEntryDescriptor.h"
#include "nsICacheStorageVisitor.h"
#include "nsThreadUtils.h"
#include "mozilla/TimeStamp.h"
class nsIURI;
class nsICacheEntryOpenCallback;
class nsICacheStorageConsumptionObserver;
class nsIApplicationCache;
class nsILoadContextInfo;
namespace mozilla { namespace net {
class CacheStorage;
class _OldCacheEntryWrapper : public nsICacheEntry
{
public:
NS_DECL_THREADSAFE_ISUPPORTS
// nsICacheEntryDescriptor
NS_IMETHOD SetExpirationTime(uint32_t expirationTime) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->SetExpirationTime(expirationTime);
}
nsresult OpenInputStream(uint32_t offset, nsIInputStream * *_retval)
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->OpenInputStream(offset, _retval);
}
nsresult OpenOutputStream(uint32_t offset, nsIOutputStream * *_retval)
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->OpenOutputStream(offset, _retval);
}
NS_IMETHOD GetPredictedDataSize(int64_t *aPredictedDataSize) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->GetPredictedDataSize(aPredictedDataSize);
}
NS_IMETHOD SetPredictedDataSize(int64_t aPredictedDataSize) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->SetPredictedDataSize(aPredictedDataSize);
}
NS_IMETHOD GetSecurityInfo(nsISupports * *aSecurityInfo) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->GetSecurityInfo(aSecurityInfo);
}
NS_IMETHOD SetSecurityInfo(nsISupports *aSecurityInfo) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->SetSecurityInfo(aSecurityInfo);
}
NS_IMETHOD GetStorageDataSize(uint32_t *aStorageDataSize) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->GetStorageDataSize(aStorageDataSize);
}
nsresult AsyncDoom(nsICacheListener *listener)
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->AsyncDoom(listener);
}
NS_IMETHOD MarkValid(void) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->MarkValid();
}
NS_IMETHOD Close(void) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->Close();
}
NS_IMETHOD GetMetaDataElement(const char * key, char * *_retval) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->GetMetaDataElement(key, _retval);
}
NS_IMETHOD SetMetaDataElement(const char * key, const char * value) MOZ_OVERRIDE
{
return !mOldDesc ? NS_ERROR_NULL_POINTER :
mOldDesc->SetMetaDataElement(key, value);
}
// nsICacheEntryInfo
NS_IMETHOD GetKey(nsACString & aKey) MOZ_OVERRIDE
{
return mOldInfo->GetKey(aKey);
}
NS_IMETHOD GetFetchCount(int32_t *aFetchCount) MOZ_OVERRIDE
{
return mOldInfo->GetFetchCount(aFetchCount);
}
NS_IMETHOD GetLastFetched(uint32_t *aLastFetched) MOZ_OVERRIDE
{
return mOldInfo->GetLastFetched(aLastFetched);
}
NS_IMETHOD GetLastModified(uint32_t *aLastModified) MOZ_OVERRIDE
{
return mOldInfo->GetLastModified(aLastModified);
}
NS_IMETHOD GetExpirationTime(uint32_t *aExpirationTime) MOZ_OVERRIDE
{
return mOldInfo->GetExpirationTime(aExpirationTime);
}
nsresult GetDataSize(uint32_t *aDataSize)
{
return mOldInfo->GetDataSize(aDataSize);
}
NS_IMETHOD AsyncDoom(nsICacheEntryDoomCallback* listener) MOZ_OVERRIDE;
NS_IMETHOD GetPersistent(bool *aPersistToDisk) MOZ_OVERRIDE;
NS_IMETHOD GetIsForcedValid(bool *aIsForcedValid) MOZ_OVERRIDE;
NS_IMETHOD ForceValidFor(uint32_t aSecondsToTheFuture) MOZ_OVERRIDE;
NS_IMETHOD SetValid() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD MetaDataReady() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD Recreate(bool, nsICacheEntry**) MOZ_OVERRIDE;
NS_IMETHOD GetDataSize(int64_t *size) MOZ_OVERRIDE;
NS_IMETHOD OpenInputStream(int64_t offset, nsIInputStream * *_retval) MOZ_OVERRIDE;
NS_IMETHOD OpenOutputStream(int64_t offset, nsIOutputStream * *_retval) MOZ_OVERRIDE;
NS_IMETHOD MaybeMarkValid() MOZ_OVERRIDE;
NS_IMETHOD HasWriteAccess(bool aWriteOnly, bool *aWriteAccess) MOZ_OVERRIDE;
NS_IMETHOD VisitMetaData(nsICacheEntryMetaDataVisitor*) MOZ_OVERRIDE;
explicit _OldCacheEntryWrapper(nsICacheEntryDescriptor* desc);
explicit _OldCacheEntryWrapper(nsICacheEntryInfo* info);
private:
virtual ~_OldCacheEntryWrapper();
_OldCacheEntryWrapper() = delete;
nsICacheEntryDescriptor* mOldDesc; // ref holded in mOldInfo
nsCOMPtr<nsICacheEntryInfo> mOldInfo;
};
class _OldCacheLoad : public nsRunnable
, public nsICacheListener
{
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIRUNNABLE
NS_DECL_NSICACHELISTENER
_OldCacheLoad(nsCSubstring const& aScheme,
nsCSubstring const& aCacheKey,
nsICacheEntryOpenCallback* aCallback,
nsIApplicationCache* aAppCache,
nsILoadContextInfo* aLoadInfo,
bool aWriteToDisk,
uint32_t aFlags);
nsresult Start();
protected:
virtual ~_OldCacheLoad();
private:
void Check();
nsCOMPtr<nsIEventTarget> mCacheThread;
nsCString const mScheme;
nsCString const mCacheKey;
nsCOMPtr<nsICacheEntryOpenCallback> mCallback;
nsCOMPtr<nsILoadContextInfo> mLoadInfo;
uint32_t const mFlags;
bool const mWriteToDisk : 1;
bool mNew : 1;
bool mOpening : 1;
bool mSync : 1;
nsCOMPtr<nsICacheEntry> mCacheEntry;
nsresult mStatus;
uint32_t mRunCount;
nsCOMPtr<nsIApplicationCache> mAppCache;
mozilla::TimeStamp mLoadStart;
};
class _OldStorage : public nsICacheStorage
{
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICACHESTORAGE
public:
_OldStorage(nsILoadContextInfo* aInfo,
bool aAllowDisk,
bool aLookupAppCache,
bool aOfflineStorage,
nsIApplicationCache* aAppCache);
private:
virtual ~_OldStorage();
nsresult AssembleCacheKey(nsIURI *aURI, nsACString const & aIdExtension,
nsACString & aCacheKey, nsACString & aScheme);
nsresult ChooseApplicationCache(nsCSubstring const &cacheKey, nsIApplicationCache** aCache);
nsCOMPtr<nsILoadContextInfo> mLoadInfo;
nsCOMPtr<nsIApplicationCache> mAppCache;
bool const mWriteToDisk : 1;
bool const mLookupAppCache : 1;
bool const mOfflineStorage : 1;
};
class _OldVisitCallbackWrapper : public nsICacheVisitor
{
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_NSICACHEVISITOR
_OldVisitCallbackWrapper(char const * deviceID,
nsICacheStorageVisitor * cb,
bool visitEntries,
nsILoadContextInfo * aInfo)
: mCB(cb)
, mVisitEntries(visitEntries)
, mDeviceID(deviceID)
, mLoadInfo(aInfo)
, mHit(false)
{
MOZ_COUNT_CTOR(_OldVisitCallbackWrapper);
}
private:
virtual ~_OldVisitCallbackWrapper();
nsCOMPtr<nsICacheStorageVisitor> mCB;
bool mVisitEntries;
char const * mDeviceID;
nsCOMPtr<nsILoadContextInfo> mLoadInfo;
bool mHit; // set to true when the device was found
};
class _OldGetDiskConsumption : public nsRunnable,
public nsICacheVisitor
{
public:
static nsresult Get(nsICacheStorageConsumptionObserver* aCallback);
private:
explicit _OldGetDiskConsumption(nsICacheStorageConsumptionObserver* aCallback);
virtual ~_OldGetDiskConsumption() {}
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSICACHEVISITOR
NS_DECL_NSIRUNNABLE
nsCOMPtr<nsICacheStorageConsumptionObserver> mCallback;
int64_t mSize;
};
}}
#endif