From 110539616efea816adcccf6658da3d8a13e17288 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Tue, 23 Aug 2016 06:05:01 -0700 Subject: [PATCH] Bug 1296726, part 2 - Remove unused methods from nsIInterfaceInfoManager. r=froydnj MozReview-Commit-ID: 2Znf8iN3pU4 --- .../xptinfo/nsIInterfaceInfoManager.idl | 8 --- .../xptinfo/xptiInterfaceInfoManager.cpp | 63 ------------------- 2 files changed, 71 deletions(-) diff --git a/xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl b/xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl index 01b9b2516076..bc63aed49338 100644 --- a/xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl +++ b/xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl @@ -9,20 +9,12 @@ #include "nsISupports.idl" interface nsIInterfaceInfo; -interface nsIEnumerator; [builtinclass, uuid(1d53d8d9-1d92-428f-b5cc-198b55e897d7)] interface nsIInterfaceInfoManager : nsISupports { nsIInterfaceInfo getInfoForIID(in nsIIDPtr iid); nsIInterfaceInfo getInfoForName(in string name); - - nsIIDPtr getIIDForName(in string name); - string getNameForIID(in nsIIDPtr iid); - - void autoRegisterInterfaces(); - - nsIEnumerator enumerateInterfacesWhoseNamesStartWith(in string prefix); }; %{C++ diff --git a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp index f9e0104df565..5fa5db3b055c 100644 --- a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp +++ b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp @@ -221,38 +221,6 @@ XPTInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_re return EntryToInfo(entry, _retval); } -NS_IMETHODIMP -XPTInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval) -{ - NS_ASSERTION(name, "bad param"); - NS_ASSERTION(_retval, "bad param"); - - ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor); - xptiInterfaceEntry* entry = mWorkingSet.mNameTable.Get(name); - if (!entry) { - *_retval = nullptr; - return NS_ERROR_FAILURE; - } - - return entry->GetIID(_retval); -} - -NS_IMETHODIMP -XPTInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval) -{ - NS_ASSERTION(iid, "bad param"); - NS_ASSERTION(_retval, "bad param"); - - ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor); - xptiInterfaceEntry* entry = mWorkingSet.mIIDTable.Get(*iid); - if (!entry) { - *_retval = nullptr; - return NS_ERROR_FAILURE; - } - - return entry->GetName(_retval); -} - void XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray& aInterfaces) { @@ -271,34 +239,3 @@ XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray& a } } } - -NS_IMETHODIMP -XPTInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval) -{ - nsCOMPtr array; - nsresult rv = NS_NewISupportsArray(getter_AddRefs(array)); - if (NS_FAILED(rv)) { - return rv; - } - - ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor); - uint32_t length = static_cast(strlen(prefix)); - for (auto iter = mWorkingSet.mNameTable.Iter(); !iter.Done(); iter.Next()) { - xptiInterfaceEntry* entry = iter.UserData(); - const char* name = entry->GetTheName(); - if (name != PL_strnstr(name, prefix, length)) { - continue; - } - nsCOMPtr ii; - if (NS_SUCCEEDED(EntryToInfo(entry, getter_AddRefs(ii)))) { - array->AppendElement(ii); - } - } - return array->Enumerate(_retval); -} - -NS_IMETHODIMP -XPTInterfaceInfoManager::AutoRegisterInterfaces() -{ - return NS_ERROR_NOT_IMPLEMENTED; -}