Bug 1296726, part 2 - Remove unused methods from nsIInterfaceInfoManager. r=froydnj
MozReview-Commit-ID: 2Znf8iN3pU4
--- a/xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl
+++ b/xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl
@@ -4,30 +4,22 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* The nsIInterfaceInfoManager public declaration. */
#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++
#define NS_INTERFACEINFOMANAGER_SERVICE_CID \
{ /* 13bef784-f8e0-4f96-85c1-09f9ef4f9a19 */ \
0x13bef784, 0xf8e0, 0x4f96, \
{0x85, 0xc1, 0x09, 0xf9, 0xef, 0x4f, 0x9a, 0x19} }
--- a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
@@ -216,48 +216,16 @@ XPTInterfaceInfoManager::GetInfoForName(
NS_ASSERTION(name, "bad param");
NS_ASSERTION(_retval, "bad param");
ReentrantMonitorAutoEnter monitor(mWorkingSet.mTableReentrantMonitor);
xptiInterfaceEntry* entry = mWorkingSet.mNameTable.Get(name);
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<nsIInterfaceInfo>& aInterfaces)
{
// I didn't want to incur the size overhead of using nsHashtable just to
// make building an enumerator easier. So, this code makes a snapshot of
// the table using an nsISupportsArray and builds an enumerator for that.
// We can afford this transient cost.
@@ -266,39 +234,8 @@ XPTInterfaceInfoManager::GetScriptableIn
for (auto iter = mWorkingSet.mNameTable.Iter(); !iter.Done(); iter.Next()) {
xptiInterfaceEntry* entry = iter.UserData();
if (entry->GetScriptableFlag()) {
nsCOMPtr<nsIInterfaceInfo> ii = entry->InterfaceInfo();
aInterfaces.AppendElement(ii);
}
}
}
-
-NS_IMETHODIMP
-XPTInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval)
-{
- nsCOMPtr<nsISupportsArray> array;
- nsresult rv = NS_NewISupportsArray(getter_AddRefs(array));
- if (NS_FAILED(rv)) {
- return rv;
- }
-
- 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.UserData();
- const char* name = entry->GetTheName();
- if (name != PL_strnstr(name, prefix, length)) {
- continue;
- }
- nsCOMPtr<nsIInterfaceInfo> 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;
-}