зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1296726, part 2 - Remove unused methods from nsIInterfaceInfoManager. r=froydnj
MozReview-Commit-ID: 2Znf8iN3pU4
This commit is contained in:
Родитель
fc6173089e
Коммит
110539616e
|
@ -9,20 +9,12 @@
|
||||||
#include "nsISupports.idl"
|
#include "nsISupports.idl"
|
||||||
|
|
||||||
interface nsIInterfaceInfo;
|
interface nsIInterfaceInfo;
|
||||||
interface nsIEnumerator;
|
|
||||||
|
|
||||||
[builtinclass, uuid(1d53d8d9-1d92-428f-b5cc-198b55e897d7)]
|
[builtinclass, uuid(1d53d8d9-1d92-428f-b5cc-198b55e897d7)]
|
||||||
interface nsIInterfaceInfoManager : nsISupports
|
interface nsIInterfaceInfoManager : nsISupports
|
||||||
{
|
{
|
||||||
nsIInterfaceInfo getInfoForIID(in nsIIDPtr iid);
|
nsIInterfaceInfo getInfoForIID(in nsIIDPtr iid);
|
||||||
nsIInterfaceInfo getInfoForName(in string name);
|
nsIInterfaceInfo getInfoForName(in string name);
|
||||||
|
|
||||||
nsIIDPtr getIIDForName(in string name);
|
|
||||||
string getNameForIID(in nsIIDPtr iid);
|
|
||||||
|
|
||||||
void autoRegisterInterfaces();
|
|
||||||
|
|
||||||
nsIEnumerator enumerateInterfacesWhoseNamesStartWith(in string prefix);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
%{C++
|
%{C++
|
||||||
|
|
|
@ -221,38 +221,6 @@ XPTInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_re
|
||||||
return EntryToInfo(entry, _retval);
|
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
|
void
|
||||||
XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray<nsIInterfaceInfo>& aInterfaces)
|
XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray<nsIInterfaceInfo>& aInterfaces)
|
||||||
{
|
{
|
||||||
|
@ -271,34 +239,3 @@ XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray<nsIInterfaceInfo>& a
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче