corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 6534f8b9aa74 (bug 491013, assert on startup).

Browse Source
This commit is contained in:
Andreas Gal
2009-05-04 15:07:53 -07:00
parent 5ef9af3875
commit 079d3cd7df
14 changed files with 126 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/jsxml.cpp
View File

@@ -7623,6 +7623,8 @@ js_InitXMLClasses(JSContext *cx, JSObject *obj)
return NULL;
if (!js_InitAnyNameClass(cx, obj))
return NULL;
if (!js_InitXMLFilterClass(cx, obj))
return NULL;
return js_InitXMLClass(cx, obj);
}
@@ -8131,13 +8133,30 @@ xmlfilter_finalize(JSContext *cx, JSObject *obj)
JSClass js_XMLFilterClass = {
"XMLFilter",
JSCLASS_HAS_PRIVATE | JSCLASS_IS_ANONYMOUS | JSCLASS_MARK_IS_TRACE,
JSCLASS_HAS_PRIVATE |
JSCLASS_IS_ANONYMOUS |
JSCLASS_MARK_IS_TRACE |
JSCLASS_HAS_CACHED_PROTO(JSProto_XMLFilter),
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, xmlfilter_finalize,
NULL, NULL, NULL, NULL,
NULL, NULL, JS_CLASS_TRACE(xmlfilter_trace), NULL
};
JSObject *
js_InitXMLFilterClass(JSContext *cx, JSObject *obj)
{
JSObject *proto;
proto = JS_InitClass(cx, obj, NULL, &js_XMLFilterClass, NULL, 0, NULL,
NULL, NULL, NULL);
if (!proto)
return NULL;
OBJ_CLEAR_PROTO(cx, proto);
return proto;
}
JSBool
js_StepXMLListFilter(JSContext *cx, JSBool initialized)
{
@@ -8176,8 +8195,7 @@ js_StepXMLListFilter(JSContext *cx, JSBool initialized)
return JS_FALSE;
}
filterobj = js_NewObjectWithGivenProto(cx, &js_XMLFilterClass,
NULL, NULL, 0);
filterobj = js_NewObject(cx, &js_XMLFilterClass, NULL, NULL, 0);
if (!filterobj)
return JS_FALSE;