Index: mozilla/dom/src/base/nsDOMClassInfo.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsDOMClassInfo.cpp,v retrieving revision 1.448 diff -pu -r1.448 mozilla/dom/src/base/nsDOMClassInfo.cpp --- mozilla/dom/src/base/nsDOMClassInfo.cpp +++ mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -1602,10 +1602,10 @@ CutPrefix(const char *aName) { nsresult nsDOMClassInfo::RegisterClassName(PRInt32 aClassInfoID) { - extern nsScriptNameSpaceManager *gNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); - gNameSpaceManager->RegisterClassName(sClassInfoData[aClassInfoID].mName, + gScriptNameSpaceManager->RegisterClassName(sClassInfoData[aClassInfoID].mName, aClassInfoID); return NS_OK; @@ -1615,8 +1615,8 @@ nsDOMClassInfo::RegisterClassName(PRInt3 nsresult nsDOMClassInfo::RegisterClassProtos(PRInt32 aClassInfoID) { - extern nsScriptNameSpaceManager *gNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); PRBool found_old; const nsIID *primary_iid = sClassInfoData[aClassInfoID].mProtoChainInterface; @@ -1649,7 +1649,7 @@ nsDOMClassInfo::RegisterClassProtos(PRIn nsXPIDLCString name; if_info->GetName(getter_Copies(name)); - gNameSpaceManager->RegisterClassProto(CutPrefix(name), iid, &found_old); + gScriptNameSpaceManager->RegisterClassProto(CutPrefix(name), iid, &found_old); nsMemory::Free(iid); @@ -1670,8 +1670,8 @@ nsDOMClassInfo::RegisterClassProtos(PRIn nsresult nsDOMClassInfo::RegisterExternalClasses() { - extern nsScriptNameSpaceManager *gNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); nsresult rv; nsCOMPtr registrar; @@ -1711,12 +1711,12 @@ nsDOMClassInfo::RegisterExternalClasses( continue; } - rv = gNameSpaceManager->RegisterExternalClassName(categoryEntry.get(), *cid); + rv = gScriptNameSpaceManager->RegisterExternalClassName(categoryEntry.get(), *cid); nsMemory::Free(cid); NS_ENSURE_SUCCESS(rv, rv); } - return gNameSpaceManager->RegisterExternalInterfaces(PR_TRUE); + return gScriptNameSpaceManager->RegisterExternalInterfaces(PR_TRUE); } #define _DOM_CLASSINFO_MAP_BEGIN(_class, _ifptr, _has_class_if) \ @@ -1783,8 +1783,8 @@ nsDOMClassInfo::Init() NS_ENSURE_TRUE(!sIsInitialized, NS_ERROR_ALREADY_INITIALIZED); - extern nsScriptNameSpaceManager *gNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); nsresult rv = CallGetService(nsIXPConnect::GetCID(), &sXPConnect); NS_ENSURE_SUCCESS(rv, rv); @@ -4906,13 +4906,13 @@ private: { *aNameStruct = nsnull; - extern nsScriptNameSpaceManager *gNameSpaceManager; - if (!gNameSpaceManager) { + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; + if (!gScriptNameSpaceManager) { NS_ERROR("Can't get namespace manager."); return NS_ERROR_UNEXPECTED; } - gNameSpaceManager->LookupName(aName, aNameStruct); + gScriptNameSpaceManager->LookupName(aName, aNameStruct); // Return NS_OK here, aName just isn't a DOM class but nothing failed. return NS_OK; @@ -5033,8 +5033,8 @@ nsDOMConstructor::HasInstance(nsIXPConne return NS_OK; } - extern nsScriptNameSpaceManager *gNameSpaceManager; - NS_ASSERTION(gNameSpaceManager, "Can't get namespace manager?"); + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; + NS_ASSERTION(gScriptNameSpaceManager, "Can't get namespace manager?"); const nsIID *class_iid; if (class_name_struct->mType == nsGlobalNameStruct::eTypeInterface || @@ -5047,7 +5047,7 @@ nsDOMConstructor::HasInstance(nsIXPConne class_iid = class_name_struct->mData->mProtoChainInterface; } else if (class_name_struct->mType == nsGlobalNameStruct::eTypeExternalConstructorAlias) { const nsGlobalNameStruct* alias_struct = - gNameSpaceManager->GetConstructorProto(class_name_struct); + gScriptNameSpaceManager->GetConstructorProto(class_name_struct); if (!alias_struct) { NS_ERROR("Couldn't get constructor prototype."); return NS_ERROR_UNEXPECTED; @@ -5069,7 +5069,7 @@ nsDOMConstructor::HasInstance(nsIXPConne } if (name_struct->mType == nsGlobalNameStruct::eTypeExternalConstructorAlias) { - name_struct = gNameSpaceManager->GetConstructorProto(name_struct); + name_struct = gScriptNameSpaceManager->GetConstructorProto(name_struct); if (!name_struct) { NS_ERROR("Couldn't get constructor prototype."); return NS_ERROR_UNEXPECTED; @@ -5139,16 +5139,16 @@ nsWindowSH::GlobalResolve(nsGlobalWindow { *did_resolve = PR_FALSE; - extern nsScriptNameSpaceManager *gNameSpaceManager; + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); nsDependentJSString name(str); const nsGlobalNameStruct *name_struct = nsnull; const PRUnichar *class_name = nsnull; - gNameSpaceManager->LookupName(name, &name_struct, &class_name); + gScriptNameSpaceManager->LookupName(name, &name_struct, &class_name); if (!name_struct) { return NS_OK; @@ -5168,7 +5168,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow rv = creator->RegisterDOMCI(NS_ConvertUTF16toUTF8(name).get(), sof); NS_ENSURE_SUCCESS(rv, rv); - rv = gNameSpaceManager->LookupName(name, &name_struct); + rv = gScriptNameSpaceManager->LookupName(name, &name_struct); if (NS_FAILED(rv) || !name_struct || name_struct->mType != nsGlobalNameStruct::eTypeExternalClassInfo) { NS_ERROR("Couldn't get the DOM ClassInfo data."); @@ -5233,7 +5233,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow } else if (name_struct->mType == nsGlobalNameStruct::eTypeExternalClassInfo) { ci_data = name_struct->mData; } else if (name_struct->mType == nsGlobalNameStruct::eTypeExternalConstructorAlias) { - alias_struct = gNameSpaceManager->GetConstructorProto(name_struct); + alias_struct = gScriptNameSpaceManager->GetConstructorProto(name_struct); NS_ENSURE_TRUE(alias_struct, NS_ERROR_UNEXPECTED); if (alias_struct->mType == nsGlobalNameStruct::eTypeClassConstructor) { Index: mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp,v retrieving revision 1.18 diff -pu -r1.18 mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp --- mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp +++ mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp @@ -226,12 +226,12 @@ nsDOMScriptObjectFactory::GetClassInfoIn NS_IMETHODIMP_(nsISupports *) nsDOMScriptObjectFactory::GetExternalClassInfoInstance(const nsAString& aName) { - extern nsScriptNameSpaceManager *gNameSpaceManager; + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, nsnull); + NS_ENSURE_TRUE(gScriptNameSpaceManager, nsnull); const nsGlobalNameStruct *globalStruct; - gNameSpaceManager->LookupName(aName, &globalStruct); + gScriptNameSpaceManager->LookupName(aName, &globalStruct); if (globalStruct) { if (globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfoCreator) { nsresult rv; @@ -241,7 +241,7 @@ nsDOMScriptObjectFactory::GetExternalCla rv = creator->RegisterDOMCI(NS_ConvertUTF16toUTF8(aName).get(), this); NS_ENSURE_SUCCESS(rv, nsnull); - rv = gNameSpaceManager->LookupName(aName, &globalStruct); + rv = gScriptNameSpaceManager->LookupName(aName, &globalStruct); NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && globalStruct, nsnull); NS_ASSERTION(globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfo, @@ -364,11 +364,11 @@ nsDOMScriptObjectFactory::RegisterDOMCla PRBool aHasClassInterface, const nsCID *aConstructorCID) { - extern nsScriptNameSpaceManager *gNameSpaceManager; + extern nsScriptNameSpaceManager *gScriptNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); - return gNameSpaceManager->RegisterDOMCIData(aName, + return gScriptNameSpaceManager->RegisterDOMCIData(aName, aConstructorFptr, aProtoChainInterface, aInterfaces, Index: mozilla/dom/src/base/nsJSEnvironment.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsJSEnvironment.cpp,v retrieving revision 1.325 diff -pu -r1.325 mozilla/dom/src/base/nsJSEnvironment.cpp --- mozilla/dom/src/base/nsJSEnvironment.cpp +++ mozilla/dom/src/base/nsJSEnvironment.cpp @@ -173,7 +173,7 @@ static PRUint32 sPendingLoadCount; // the middle of loading a page. static PRBool sLoadInProgressGCTimer; -nsScriptNameSpaceManager *gNameSpaceManager; +nsScriptNameSpaceManager *gScriptNameSpaceManager; static nsIJSRuntimeService *sRuntimeService; JSRuntime *nsJSRuntime::sRuntime; @@ -2203,11 +2203,11 @@ nsJSContext::InitContext(nsIScriptGlobal nsresult rv; - if (!gNameSpaceManager) { - gNameSpaceManager = new nsScriptNameSpaceManager; - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_OUT_OF_MEMORY); + if (!gScriptNameSpaceManager) { + gScriptNameSpaceManager = new nsScriptNameSpaceManager; + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_OUT_OF_MEMORY); - rv = gNameSpaceManager->Init(); + rv = gScriptNameSpaceManager->Init(); NS_ENSURE_SUCCESS(rv, rv); } @@ -2299,9 +2299,9 @@ nsJSContext::InitContext(nsIScriptGlobal nsresult nsJSContext::InitializeExternalClasses() { - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + NS_ENSURE_TRUE(gScriptNameSpaceManager, NS_ERROR_NOT_INITIALIZED); - return gNameSpaceManager->InitForContext(this); + return gScriptNameSpaceManager->InitForContext(this); } nsresult @@ -3380,7 +3380,7 @@ nsJSRuntime::Startup() sReadyForGC = PR_FALSE; sLoadInProgressGCTimer = PR_FALSE; sPendingLoadCount = 0; - gNameSpaceManager = nsnull; + gScriptNameSpaceManager = nsnull; sRuntimeService = nsnull; sRuntime = nsnull; gOldJSGCCallback = nsnull; @@ -3530,8 +3530,8 @@ void nsJSRuntime::ShutDown() sLoadInProgressGCTimer = PR_FALSE; } - delete gNameSpaceManager; - gNameSpaceManager = nsnull; + delete gScriptNameSpaceManager; + gScriptNameSpaceManager = nsnull; if (!sContextCount) { // We're being shutdown, and there are no more contexts