зеркало из https://github.com/mozilla/gecko-dev.git
Go back to not-unloading component DLLs because of balsa orange :-(
This commit is contained in:
Родитель
dc41c5b6ef
Коммит
448479d2a7
|
@ -215,10 +215,6 @@ PLDHashOperator
|
||||||
nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
|
nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
|
||||||
NativeLoadData& aLoadData, void*)
|
NativeLoadData& aLoadData, void*)
|
||||||
{
|
{
|
||||||
#ifdef NS_BUILD_REFCNT_LOGGING
|
|
||||||
nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (PR_LOG_TEST(nsNativeModuleLoaderLog, PR_LOG_DEBUG)) {
|
if (PR_LOG_TEST(nsNativeModuleLoaderLog, PR_LOG_DEBUG)) {
|
||||||
nsCOMPtr<nsIFile> file(do_QueryInterface(aHashedFile));
|
nsCOMPtr<nsIFile> file(do_QueryInterface(aHashedFile));
|
||||||
|
|
||||||
|
@ -229,8 +225,16 @@ nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
|
||||||
("nsNativeModuleLoader::UnloaderFunc(\"%s\")", filePath.get()));
|
("nsNativeModuleLoader::UnloaderFunc(\"%s\")", filePath.get()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef NS_BUILD_REFCNT_LOGGING
|
||||||
|
nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
// XXXbsmedberg: do this as soon as the static-destructor crash(es)
|
||||||
|
// are fixed
|
||||||
PRStatus ret = PR_UnloadLibrary(aLoadData.library);
|
PRStatus ret = PR_UnloadLibrary(aLoadData.library);
|
||||||
NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library");
|
NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library");
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NS_BUILD_REFCNT_LOGGING
|
#ifdef NS_BUILD_REFCNT_LOGGING
|
||||||
nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);
|
nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче