зеркало из https://github.com/mozilla/gecko-dev.git
Bug 962290. Remove support for the JavaScript-global-dynamic-nameset category as a way to install lazy properties on the global. r=peterv
This commit is contained in:
Родитель
8f926f8c8b
Коммит
fdd4a7a9e4
|
@ -3079,19 +3079,6 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
|
|||
return ok ? NS_OK : NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if (name_struct->mType == nsGlobalNameStruct::eTypeDynamicNameSet) {
|
||||
nsCOMPtr<nsIScriptExternalNameSet> nameset =
|
||||
do_CreateInstance(name_struct->mCID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsIScriptContext *context = aWin->GetContext();
|
||||
NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
|
||||
|
||||
rv = nameset->InitializeNameSet(context);
|
||||
|
||||
*did_resolve = true;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,9 +25,6 @@
|
|||
#define JAVASCRIPT_GLOBAL_STATIC_NAMESET_CATEGORY \
|
||||
"JavaScript-global-static-nameset"
|
||||
|
||||
#define JAVASCRIPT_GLOBAL_DYNAMIC_NAMESET_CATEGORY \
|
||||
"JavaScript-global-dynamic-nameset"
|
||||
|
||||
#define JAVASCRIPT_DOM_CLASS \
|
||||
"JavaScript-DOM-class"
|
||||
|
||||
|
|
|
@ -369,9 +369,6 @@ nsScriptNameSpaceManager::Init()
|
|||
rv = FillHash(cm, JAVASCRIPT_GLOBAL_STATIC_NAMESET_CATEGORY);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
rv = FillHash(cm, JAVASCRIPT_GLOBAL_DYNAMIC_NAMESET_CATEGORY);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
rv = FillHash(cm, JAVASCRIPT_NAVIGATOR_PROPERTY_CATEGORY);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
|
@ -626,8 +623,6 @@ nsScriptNameSpaceManager::OperateCategoryEntryHash(nsICategoryManager* aCategory
|
|||
type = nsGlobalNameStruct::eTypeNavigatorProperty;
|
||||
} else if (strcmp(aCategory, JAVASCRIPT_GLOBAL_STATIC_NAMESET_CATEGORY) == 0) {
|
||||
type = nsGlobalNameStruct::eTypeStaticNameSet;
|
||||
} else if (strcmp(aCategory, JAVASCRIPT_GLOBAL_DYNAMIC_NAMESET_CATEGORY) == 0) {
|
||||
type = nsGlobalNameStruct::eTypeDynamicNameSet;
|
||||
} else {
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
@ -50,7 +50,6 @@ struct nsGlobalNameStruct
|
|||
eTypeNavigatorProperty,
|
||||
eTypeExternalConstructor,
|
||||
eTypeStaticNameSet,
|
||||
eTypeDynamicNameSet,
|
||||
eTypeClassConstructor,
|
||||
eTypeClassProto,
|
||||
eTypeExternalClassInfoCreator,
|
||||
|
|
Загрузка…
Ссылка в новой задаче