wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 984124 - Convert nsWebBrowserPersist::mURIMap to nsClassHashtable. r=bsmedberg

Browse Source
This commit is contained in:
Anuj Agarwal 2014-04-02 05:56:06 -07:00
parent 10bd8dee09
commit 9c1df3711a
2 changed files with 42 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
View File

@ -529,14 +529,14 @@ nsWebBrowserPersist::SaveGatheredURIs(nsIURI *aFileAsURI)
uint32_t urisToPersist = 0;
if (mURIMap.Count() > 0)
{
mURIMap.Enumerate(EnumCountURIsToPersist, &urisToPersist);
mURIMap.EnumerateRead(EnumCountURIsToPersist, &urisToPersist);
}
if (urisToPersist > 0)
{
// Persist each file in the uri map. The document(s)
// will be saved after the last one of these is saved.
mURIMap.Enumerate(EnumPersistURIs, this);
mURIMap.EnumerateRead(EnumPersistURIs, this);
}
// if we don't have anything in mOutputMap (added from above enumeration)
@ -1201,7 +1201,7 @@ nsresult nsWebBrowserPersist::SaveURIInternal(
// Open a channel to the URI
nsCOMPtr<nsIChannel> inputChannel;
rv = NS_NewChannel(getter_AddRefs(inputChannel), aURI,
nullptr, nullptr, static_cast<nsIInterfaceRequestor *>(this),
nullptr, nullptr, static_cast<nsIInterfaceRequestor*>(this),
loadFlags);
nsCOMPtr<nsIPrivateBrowsingChannel> pbChannel = do_QueryInterface(inputChannel);
@ -1765,8 +1765,7 @@ nsresult nsWebBrowserPersist::SaveDocuments()
void nsWebBrowserPersist::Cleanup()
{
mURIMap.Enumerate(EnumCleanupURIMap, this);
mURIMap.Reset();
mURIMap.Clear();
mOutputMap.EnumerateRead(EnumCleanupOutputMap, this);
mOutputMap.Clear();
mUploadList.EnumerateRead(EnumCleanupUploadList, this);
@ -2358,7 +2357,7 @@ nsWebBrowserPersist::FixRedirectedChannelEntry(nsIChannel *aNewChannel)
PLDHashOperator
nsWebBrowserPersist::EnumFixRedirect(nsISupports *aKey, OutputData *aData, void* aClosure)
{
FixRedirectData *data = static_cast<FixRedirectData *>(aClosure);
FixRedirectData *data = static_cast<FixRedirectData*>(aClosure);
nsCOMPtr<nsIChannel> thisChannel = do_QueryInterface(aKey);
nsCOMPtr<nsIURI> thisURI;
@ -2407,7 +2406,7 @@ nsWebBrowserPersist::CalcTotalProgress()
PLDHashOperator
nsWebBrowserPersist::EnumCalcProgress(nsISupports *aKey, OutputData *aData, void* aClosure)
{
nsWebBrowserPersist *pthis = static_cast<nsWebBrowserPersist *>(aClosure);
nsWebBrowserPersist *pthis = static_cast<nsWebBrowserPersist*>(aClosure);
// only count toward total progress if destination file is local
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(aData->mFile);
@ -2424,75 +2423,73 @@ nsWebBrowserPersist::EnumCalcUploadProgress(nsISupports *aKey, UploadData *aData
{
if (aData && aClosure)
{
nsWebBrowserPersist *pthis = static_cast<nsWebBrowserPersist *>(aClosure);
nsWebBrowserPersist *pthis = static_cast<nsWebBrowserPersist*>(aClosure);
pthis->mTotalCurrentProgress += aData->mSelfProgress;
pthis->mTotalMaxProgress += aData->mSelfProgressMax;
}
return PL_DHASH_NEXT;
}
bool
nsWebBrowserPersist::EnumCountURIsToPersist(nsHashKey *aKey, void *aData, void* closure)
PLDHashOperator
nsWebBrowserPersist::EnumCountURIsToPersist(const nsACString &aKey, URIData *aData, void* aClosure)
{
URIData *data = (URIData *) aData;
uint32_t *count = (uint32_t *) closure;
if (data->mNeedsPersisting && !data->mSaved)
uint32_t *count = static_cast<uint32_t*>(aClosure);
if (aData->mNeedsPersisting && !aData->mSaved)
{
(*count)++;
}
return true;
return PL_DHASH_NEXT;
}
bool
nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure)
PLDHashOperator
nsWebBrowserPersist::EnumPersistURIs(const nsACString &aKey, URIData *aData, void* aClosure)
{
URIData *data = (URIData *) aData;
if (!data->mNeedsPersisting || data->mSaved)
if (!aData->mNeedsPersisting || aData->mSaved)
{
return true;
return PL_DHASH_NEXT;
}
nsWebBrowserPersist *pthis = (nsWebBrowserPersist *) closure;
nsWebBrowserPersist *pthis = static_cast<nsWebBrowserPersist*>(aClosure);
nsresult rv;
// Create a URI from the key
nsAutoCString key = nsAutoCString(aKey);
nsCOMPtr<nsIURI> uri;
rv = NS_NewURI(getter_AddRefs(uri),
nsDependentCString(((nsCStringKey *) aKey)->GetString(),
((nsCStringKey *) aKey)->GetStringLength()),
data->mCharset.get());
NS_ENSURE_SUCCESS(rv, false);
nsDependentCString(key.get(), key.Length()),
aData->mCharset.get());
NS_ENSURE_SUCCESS(rv, PL_DHASH_STOP);
// Make a URI to save the data to
nsCOMPtr<nsIURI> fileAsURI;
rv = data->mDataPath->Clone(getter_AddRefs(fileAsURI));
NS_ENSURE_SUCCESS(rv, false);
rv = pthis->AppendPathToURI(fileAsURI, data->mFilename);
NS_ENSURE_SUCCESS(rv, false);
rv = aData->mDataPath->Clone(getter_AddRefs(fileAsURI));
NS_ENSURE_SUCCESS(rv, PL_DHASH_STOP);
rv = pthis->AppendPathToURI(fileAsURI, aData->mFilename);
NS_ENSURE_SUCCESS(rv, PL_DHASH_STOP);
rv = pthis->SaveURIInternal(uri, nullptr, nullptr, nullptr, nullptr, fileAsURI, true,
pthis->mIsPrivate);
// if SaveURIInternal fails, then it will have called EndDownload,
// which means that |aData| is no longer valid memory. we MUST bail.
NS_ENSURE_SUCCESS(rv, false);
NS_ENSURE_SUCCESS(rv, PL_DHASH_STOP);
if (rv == NS_OK)
{
// Store the actual object because once it's persisted this
// will be fixed up with the right file extension.
data->mFile = fileAsURI;
data->mSaved = true;
aData->mFile = fileAsURI;
aData->mSaved = true;
}
else
{
data->mNeedsFixup = false;
aData->mNeedsFixup = false;
}
if (pthis->mSerializingOutput)
return false;
return PL_DHASH_STOP;
return true;
return PL_DHASH_NEXT;
}
PLDHashOperator
@ -2506,16 +2503,6 @@ nsWebBrowserPersist::EnumCleanupOutputMap(nsISupports *aKey, OutputData *aData,
return PL_DHASH_NEXT;
}
bool
nsWebBrowserPersist::EnumCleanupURIMap(nsHashKey *aKey, void *aData, void* closure)
{
URIData *data = (URIData *) aData;
delete data; // Delete data associated with key
return true;
}
PLDHashOperator
nsWebBrowserPersist::EnumCleanupUploadList(nsISupports *aKey, UploadData *aData, void* aClosure)
{
@ -3346,12 +3333,11 @@ nsWebBrowserPersist::FixupURI(nsAString &aURI)
NS_ENSURE_SUCCESS(rv, rv);
// Search for the URI in the map and replace it with the local file
nsCStringKey key(spec.get());
if (!mURIMap.Exists(&key))
if (!mURIMap.Contains(spec))
{
return NS_ERROR_FAILURE;
}
URIData *data = (URIData *) mURIMap.Get(&key);
URIData *data = mURIMap.Get(spec);
if (!data->mNeedsFixup)
{
return NS_OK;
@ -3635,7 +3621,7 @@ nsWebBrowserPersist::CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel)
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_ARG_POINTER(*aChannel);
rv = (*aChannel)->SetNotificationCallbacks(static_cast<nsIInterfaceRequestor *>(this));
rv = (*aChannel)->SetNotificationCallbacks(static_cast<nsIInterfaceRequestor*>(this));
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
@ -3732,11 +3718,10 @@ nsWebBrowserPersist::MakeAndStoreLocalFilenameInURIMap(
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
// Create a sensibly named filename for the URI and store in the URI map
nsCStringKey key(spec.get());
URIData *data;
if (mURIMap.Exists(&key))
if (mURIMap.Contains(spec))
{
data = (URIData *) mURIMap.Get(&key);
data = mURIMap.Get(spec);
if (aNeedsPersisting)
{
data->mNeedsPersisting = true;
@ -3770,7 +3755,7 @@ nsWebBrowserPersist::MakeAndStoreLocalFilenameInURIMap(
if (aNeedsPersisting)
mCurrentThingsToPersist++;
mURIMap.Put(&key, data);
mURIMap.Put(spec, data);
if (aData)
{
*aData = data;

15
embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
View File

@ -24,7 +24,6 @@
#include "nsIWebProgressListener2.h"
#include "nsClassHashtable.h"
#include "nsHashtable.h"
#include "nsHashKeys.h"
#include "nsTArray.h"
@ -158,14 +157,10 @@ private:
void SetApplyConversionIfNeeded(nsIChannel *aChannel);
// Hash table enumerators
static bool EnumPersistURIs(
nsHashKey *aKey, void *aData, void* closure);
static bool EnumCleanupURIMap(
nsHashKey *aKey, void *aData, void* closure);
static PLDHashOperator EnumPersistURIs(
const nsACString &aKey, URIData *aData, void* aClosure);
static PLDHashOperator EnumCleanupOutputMap(
nsISupports *aKey, OutputData *aData, void* aClosure);
static bool EnumCleanupUploadList(
nsHashKey *aKey, void *aData, void* closure);
static PLDHashOperator EnumCleanupUploadList(
nsISupports *aKey, UploadData *aData, void* aClosure);
static PLDHashOperator EnumCalcProgress(
@ -174,8 +169,8 @@ private:
nsISupports *aKey, UploadData *aData, void* aClosure);
static PLDHashOperator EnumFixRedirect(
nsISupports *aKey, OutputData *aData, void* aClosure);
static bool EnumCountURIsToPersist(
nsHashKey *aKey, void *aData, void* closure);
static PLDHashOperator EnumCountURIsToPersist(
const nsACString &aKey, URIData *aData, void* aClosure);
nsCOMPtr<nsIURI> mCurrentDataPath;
bool mCurrentDataPathIsRelative;
@ -197,7 +192,7 @@ private:
nsCOMPtr<nsIProgressEventSink> mEventSink;
nsClassHashtable<nsISupportsHashKey, OutputData> mOutputMap;
nsClassHashtable<nsISupportsHashKey, UploadData> mUploadList;
nsHashtable mURIMap;
nsClassHashtable<nsCStringHashKey, URIData> mURIMap;
nsTArray<DocData*> mDocList;
nsTArray<CleanupData*> mCleanupList;
nsTArray<nsCString> mFilenameList;