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 1185470: Remove 'Get' prefixes from hashtable iterator methods. r=froydnj

Browse Source
This commit is contained in:
Kyle Huey 2015-07-20 20:21:28 +08:00
parent 4facde77d3
commit b8d33919e9
15 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/media/gmp/GMPServiceParent.cpp
View File

@ -429,16 +429,16 @@ GeckoMediaPluginServiceParent::AsyncShutdownPluginStates::Update(const nsCString
bool firstPlugin = true;
for (auto pluginIt = mStates.ConstIter(); !pluginIt.Done(); pluginIt.Next()) {
if (!firstPlugin) { note += ','; } else { firstPlugin = false; }
note += pluginIt.GetKey();
note += pluginIt.Key();
note += ":{";
bool firstInstance = true;
for (auto instanceIt = pluginIt.GetData()->ConstIter(); !instanceIt.Done(); instanceIt.Next()) {
for (auto instanceIt = pluginIt.Data()->ConstIter(); !instanceIt.Done(); instanceIt.Next()) {
if (!firstInstance) { note += ','; } else { firstInstance = false; }
note += instanceIt.GetKey();
note += instanceIt.Key();
note += ":\"";
note += instanceIt.GetData()->mStateSequence;
note += instanceIt.Data()->mStateSequence;
note += '=';
note += instanceIt.GetData()->mLastStateDescription;
note += instanceIt.Data()->mLastStateDescription;
note += '"';
}
note += '}';

16
xpcom/base/CycleCollectedJSRuntime.cpp
View File

@ -466,8 +466,8 @@ void
CycleCollectedJSRuntime::UnmarkSkippableJSHolders()
{
for (auto iter = mJSHolders.Iter(); !iter.Done(); iter.Next()) {
void* holder = iter.GetKey();
nsScriptObjectTracer*& tracer = iter.GetData();
void* holder = iter.Key();
nsScriptObjectTracer*& tracer = iter.Data();
tracer->CanSkip(holder, true);
}
}
@ -648,8 +648,8 @@ CycleCollectedJSRuntime::TraverseNativeRoots(nsCycleCollectionNoteRootCallback&
TraverseAdditionalNativeRoots(aCb);
for (auto iter = mJSHolders.Iter(); !iter.Done(); iter.Next()) {
void* holder = iter.GetKey();
nsScriptObjectTracer*& tracer = iter.GetData();
void* holder = iter.Key();
nsScriptObjectTracer*& tracer = iter.Data();
bool noteRoot = false;
if (MOZ_UNLIKELY(aCb.WantAllTraces())) {
@ -802,8 +802,8 @@ CycleCollectedJSRuntime::TraceNativeGrayRoots(JSTracer* aTracer)
TraceAdditionalNativeGrayRoots(aTracer);
for (auto iter = mJSHolders.Iter(); !iter.Done(); iter.Next()) {
void* holder = iter.GetKey();
nsScriptObjectTracer*& tracer = iter.GetData();
void* holder = iter.Key();
nsScriptObjectTracer*& tracer = iter.Data();
tracer->Trace(holder, JsGcTracer(), aTracer);
}
}
@ -1023,8 +1023,8 @@ IncrementalFinalizeRunnable::IncrementalFinalizeRunnable(CycleCollectedJSRuntime
, mReleasing(false)
{
for (auto iter = aFinalizers.Iter(); !iter.Done(); iter.Next()) {
DeferredFinalizeFunction& function = iter.GetKey();
void*& data = iter.GetData();
DeferredFinalizeFunction& function = iter.Key();
void*& data = iter.Data();
DeferredFinalizeFunctionHolder* holder =
mDeferredFinalizeFunctions.AppendElement();

4
xpcom/base/SystemMemoryReporter.cpp
View File

@ -222,8 +222,8 @@ private:
void Report(nsIHandleReportCallback* aHandleReport, nsISupports* aData)
{
for (auto iter = mTagged.Iter(); !iter.Done(); iter.Next()) {
nsCStringHashKey::KeyType key = iter.GetKey();
size_t amount = iter.GetUserData();
nsCStringHashKey::KeyType key = iter.Key();
size_t amount = iter.UserData();
nsAutoCString path("processes/");
path.Append(key);

2
xpcom/base/nsConsoleService.cpp
View File

@ -340,7 +340,7 @@ nsConsoleService::CollectCurrentListeners(
{
MutexAutoLock lock(mLock);
for (auto iter = mListeners.Iter(); !iter.Done(); iter.Next()) {
nsIConsoleListener* value = iter.GetUserData();
nsIConsoleListener* value = iter.UserData();
aListeners.AppendObject(value);
}
}

4
xpcom/components/nsCategoryManager.cpp
View File

@ -350,9 +350,9 @@ CategoryEnumerator::Create(nsClassHashtable<nsDepCharHashKey, CategoryNode>&
for (auto iter = aTable.Iter(); !iter.Done(); iter.Next()) {
// if a category has no entries, we pretend it doesn't exist
CategoryNode* aNode = iter.GetUserData();
CategoryNode* aNode = iter.UserData();
if (aNode->Count()) {
const char* str = iter.GetKey();
const char* str = iter.Key();
enumObj->mArray[enumObj->mCount++] = str;
}
}

6
xpcom/components/nsComponentManager.cpp
View File

@ -1248,7 +1248,7 @@ nsComponentManagerImpl::FreeServices()
}
for (auto iter = mFactories.Iter(); !iter.Done(); iter.Next()) {
nsFactoryEntry* entry = iter.GetUserData();
nsFactoryEntry* entry = iter.UserData();
entry->mFactory = nullptr;
entry->mServiceObject = nullptr;
}
@ -1764,7 +1764,7 @@ nsComponentManagerImpl::EnumerateCIDs(nsISimpleEnumerator** aEnumerator)
{
nsCOMArray<nsISupports> array;
for (auto iter = mFactories.Iter(); !iter.Done(); iter.Next()) {
const nsID& id = iter.GetKey();
const nsID& id = iter.Key();
nsCOMPtr<nsISupportsID> wrapper = new nsSupportsIDImpl();
wrapper->SetData(&id);
array.AppendObject(wrapper);
@ -1777,7 +1777,7 @@ nsComponentManagerImpl::EnumerateContractIDs(nsISimpleEnumerator** aEnumerator)
{
nsTArray<nsCString>* array = new nsTArray<nsCString>;
for (auto iter = mContractIDs.Iter(); !iter.Done(); iter.Next()) {
const nsACString& contract = iter.GetKey();
const nsACString& contract = iter.Key();
array->AppendElement(contract);
}

6
xpcom/components/nsNativeModuleLoader.cpp
View File

@ -197,13 +197,13 @@ nsNativeModuleLoader::UnloadLibraries()
MOZ_ASSERT(NS_IsMainThread(), "Shutdown not on main thread?");
for (auto iter = mLibraries.Iter(); !iter.Done(); iter.Next()) {
NativeLoadData& loadData = iter.GetData();
NativeLoadData& loadData = iter.Data();
loadData.mModule = nullptr;
}
for (auto iter = mLibraries.Iter(); !iter.Done(); iter.Next()) {
if (MOZ_LOG_TEST(GetNativeModuleLoaderLog(), LogLevel::Debug)) {
nsIHashable* hashedFile = iter.GetKey();
nsIHashable* hashedFile = iter.Key();
nsCOMPtr<nsIFile> file(do_QueryInterface(hashedFile));
nsAutoCString filePath;
@ -220,7 +220,7 @@ nsNativeModuleLoader::UnloadLibraries()
#if 0
// XXXbsmedberg: do this as soon as the static-destructor crash(es)
// are fixed
NativeLoadData& loadData = iter.GetData();
NativeLoadData& loadData = iter.Data();
PRStatus ret = PR_UnloadLibrary(loadData.mLibrary);
NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library");
#endif

4
xpcom/ds/nsHashPropertyBag.cpp
View File

@ -123,8 +123,8 @@ nsHashPropertyBagBase::GetEnumerator(nsISimpleEnumerator** aResult)
}
for (auto iter = mPropertyHash.Iter(); !iter.Done(); iter.Next()) {
const nsAString& key = iter.GetKey();
nsIVariant* data = iter.GetUserData();
const nsAString& key = iter.Key();
nsIVariant* data = iter.UserData();
nsSimpleProperty* sprop = new nsSimpleProperty(key, data);
propertyArray->AppendElement(sprop, false);
}

2
xpcom/ds/nsProperties.cpp
View File

@ -77,7 +77,7 @@ nsProperties::GetKeys(uint32_t* aCount, char*** aKeys)
uint32_t j = 0;
for (auto iter = this->Iter(); !iter.Done(); iter.Next()) {
const char* key = iter.GetKey();
const char* key = iter.Key();
keys[j] = strdup(key);
if (!keys[j]) {

12
xpcom/glue/nsBaseHashtable.h
View File

@ -223,10 +223,10 @@ public:
// This is an iterator that also allows entry removal. Example usage:
//
// for (auto iter = table.Iter(); !iter.Done(); iter.Next()) {
// const KeyType key = iter.GetKey();
// const UserDataType data = iter.GetUserData();
// const KeyType key = iter.Key();
// const UserDataType data = iter.UserData();
// // or
// const DataType& data = iter.GetData();
// const DataType& data = iter.Data();
// // ... do stuff with |key| and/or |data| ...
// // ... possibly call iter.Remove() once ...
// }
@ -240,12 +240,12 @@ public:
Iterator(Iterator&& aOther) : Base(aOther.mTable) {}
~Iterator() {}
KeyType GetKey() const { return static_cast<EntryType*>(Get())->GetKey(); }
UserDataType GetUserData() const
KeyType Key() const { return static_cast<EntryType*>(Get())->GetKey(); }
UserDataType UserData() const
{
return static_cast<EntryType*>(Get())->mData;
}
DataType& GetData() const { return static_cast<EntryType*>(Get())->mData; }
DataType& Data() const { return static_cast<EntryType*>(Get())->mData; }
private:
Iterator() = delete;

2
xpcom/glue/nsCategoryCache.h
View File

@ -76,7 +76,7 @@ public:
}
for (auto iter = mObserver->GetHash().Iter(); !iter.Done(); iter.Next()) {
nsISupports* entry = iter.GetUserData();
nsISupports* entry = iter.UserData();
nsCOMPtr<T> service = do_QueryInterface(entry);
if (service) {
aResult.AppendObject(service);

2
xpcom/glue/nsINIParser.cpp
View File

@ -303,7 +303,7 @@ nsresult
nsINIParser::GetSections(INISectionCallback aCB, void* aClosure)
{
for (auto iter = mSections.Iter(); !iter.Done(); iter.Next()) {
if (!aCB(iter.GetKey(), aClosure)) {
if (!aCB(iter.Key(), aClosure)) {
break;
}
}

4
xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
View File

@ -272,7 +272,7 @@ XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray<nsIInterfaceInfo>& a
ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor);
aInterfaces.SetCapacity(mWorkingSet.mNameTable.Count());
for (auto iter = mWorkingSet.mNameTable.Iter(); !iter.Done(); iter.Next()) {
xptiInterfaceEntry* entry = iter.GetUserData();
xptiInterfaceEntry* entry = iter.UserData();
if (entry->GetScriptableFlag()) {
nsCOMPtr<nsIInterfaceInfo> ii = entry->InterfaceInfo();
aInterfaces.AppendElement(ii);
@ -292,7 +292,7 @@ XPTInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *pref
ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor);
uint32_t length = static_cast<uint32_t>(strlen(prefix));
for (auto iter = mWorkingSet.mNameTable.Iter(); !iter.Done(); iter.Next()) {
xptiInterfaceEntry* entry = iter.GetUserData();
xptiInterfaceEntry* entry = iter.UserData();
const char* name = entry->GetTheName();
if (name != PL_strnstr(name, prefix, length)) {
continue;

2
xpcom/reflect/xptinfo/xptiWorkingSet.cpp
View File

@ -32,7 +32,7 @@ XPTInterfaceInfoManager::xptiWorkingSet::InvalidateInterfaceInfos()
{
ReentrantMonitorAutoEnter monitor(mTableReentrantMonitor);
for (auto iter = mNameTable.Iter(); !iter.Done(); iter.Next()) {
xptiInterfaceEntry* entry = iter.GetUserData();
xptiInterfaceEntry* entry = iter.UserData();
entry->LockedInvalidateInterfaceInfo();
}
}

2
xpcom/threads/nsThreadManager.cpp
View File

@ -132,7 +132,7 @@ nsThreadManager::Shutdown()
{
OffTheBooksMutexAutoLock lock(mLock);
for (auto iter = mThreadsByPRThread.Iter(); !iter.Done(); iter.Next()) {
nsRefPtr<nsThread>& thread = iter.GetData();
nsRefPtr<nsThread>& thread = iter.Data();
threads.AppendElement(thread);
iter.Remove();
}