wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 990290 - Get rid of dynamic XBL JSClasses. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2014-04-11 07:59:47 -07:00
parent f78fd78ef9
commit 5235649dd6
3 changed files with 13 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dom/xbl/nsXBLBinding.cpp
View File

@ -75,9 +75,6 @@ XBLFinalize(JSFreeOp *fop, JSObject *obj)
nsXBLDocumentInfo* docInfo =
static_cast<nsXBLDocumentInfo*>(::JS_GetPrivate(obj));
nsContentUtils::DeferredFinalize(docInfo);
nsXBLJSClass* c = nsXBLJSClass::fromJSClass(::JS_GetClass(obj));
delete c;
}
static bool
@ -90,34 +87,18 @@ XBLEnumerate(JSContext *cx, JS::Handle<JSObject*> obj)
return protoBinding->ResolveAllFields(cx, obj);
}
nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName)
{
memset(static_cast<JSClass*>(this), 0, sizeof(JSClass));
name = ToNewCString(aClassName);
flags =
static const JSClass gPrototypeJSClass = {
"XBL prototype JSClass",
JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS |
JSCLASS_NEW_RESOLVE |
// Our one reserved slot holds the relevant nsXBLPrototypeBinding
JSCLASS_HAS_RESERVED_SLOTS(1);
addProperty = getProperty = ::JS_PropertyStub;
delProperty = ::JS_DeletePropertyStub;
setProperty = ::JS_StrictPropertyStub;
enumerate = XBLEnumerate;
resolve = JS_ResolveStub;
convert = ::JS_ConvertStub;
finalize = XBLFinalize;
}
bool
nsXBLJSClass::IsXBLJSClass(const JSClass* aClass)
{
return aClass->finalize == XBLFinalize;
}
nsXBLJSClass::~nsXBLJSClass()
{
nsMemory::Free((void*) name);
}
JSCLASS_HAS_RESERVED_SLOTS(1),
JS_PropertyStub, JS_DeletePropertyStub,
JS_PropertyStub, JS_StrictPropertyStub,
XBLEnumerate, JS_ResolveStub,
JS_ConvertStub, XBLFinalize,
nullptr, nullptr, nullptr, nullptr
};
// Implementation /////////////////////////////////////////////////////////////////
@ -786,12 +767,7 @@ nsXBLBinding::ChangeDocument(nsIDocument* aOldDocument, nsIDocument* aNewDocumen
break;
}
const JSClass* clazz = ::JS_GetClass(proto);
if (!clazz ||
(~clazz->flags &
(JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS)) ||
JSCLASS_RESERVED_SLOTS(clazz) != 1 ||
clazz->finalize != XBLFinalize) {
if (JS_GetClass(proto) != &gPrototypeJSClass) {
// Clearly not the right class
continue;
}
@ -1035,16 +1011,14 @@ nsXBLBinding::DoInitJSClass(JSContext *cx,
*aNew = !desc.object();
if (desc.object()) {
proto = &desc.value().toObject();
MOZ_ASSERT(nsXBLJSClass::IsXBLJSClass(JS_GetClass(js::UncheckedUnwrap(proto))));
MOZ_ASSERT(JS_GetClass(js::UncheckedUnwrap(proto)) == &gPrototypeJSClass);
} else {
// We need to create the prototype. First, enter the compartment where it's
// going to live, and create it.
JSAutoCompartment ac2(cx, global);
nsXBLJSClass* c = new nsXBLJSClass(aClassName);
proto = JS_NewObjectWithGivenProto(cx, c, parent_proto, global);
proto = JS_NewObjectWithGivenProto(cx, &gPrototypeJSClass, parent_proto, global);
if (!proto) {
delete c;
return NS_ERROR_OUT_OF_MEMORY;
}

3
dom/xbl/nsXBLProtoImpl.cpp
View File

@ -91,8 +91,7 @@ nsXBLProtoImpl::InstallImplementation(nsXBLPrototypeBinding* aPrototypeBinding,
// Define it as a property on the scopeObject, using the same name used on
// the content side.
bool ok = JS_DefineProperty(cx, scopeObject,
js::GetObjectClass(targetClassObject)->name,
bool ok = JS_DefineProperty(cx, scopeObject, aPrototypeBinding->ClassName().get(),
JS::ObjectValue(*propertyHolder), JS_PropertyStub,
JS_StrictPropertyStub,
JSPROP_PERMANENT | JSPROP_READONLY);

28
dom/xbl/nsXBLService.h
View File

@ -10,14 +10,12 @@
#include "nsString.h"
#include "nsWeakReference.h"
#include "js/Class.h" // nsXBLJSClass derives from JSClass
#include "nsTArray.h"
#include "nsDataHashtable.h"
#include "nsHashKeys.h"
class nsXBLBinding;
class nsXBLDocumentInfo;
class nsXBLJSClass;
class nsIContent;
class nsIDocument;
class nsString;
@ -119,30 +117,4 @@ public:
// testing.
};
class nsXBLJSClass : public JSClass
{
public:
nsXBLJSClass(const nsAFlatCString& aClassName);
~nsXBLJSClass();
static bool IsXBLJSClass(const JSClass* aClass);
// Downcast from a pointer to const JSClass to a pointer to non-const
// nsXBLJSClass.
//
// The const_cast is safe because nsXBLJSClass instances are never actually
// const. It's necessary because we pass pointers to nsXBLJSClass to code
// which uses pointers to const JSClass, and returns them back to us that
// way, and we need to convert them back to pointers to non-const
// nsXBLJSClass so that we can modify the reference count and add them to
// the gClassLRUList list.
static nsXBLJSClass*
fromJSClass(const JSClass* c)
{
MOZ_ASSERT(IsXBLJSClass(c));
nsXBLJSClass* x = const_cast<nsXBLJSClass*>(static_cast<const nsXBLJSClass*>(c));
return x;
}
};
#endif