mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 880917 - Remove AutoVersionChecker. r=luke
Looks like cdleary added this back in bug 595691, as an equivalence to some even-older-and-more-overly-cautious XBL code that was saving and restoring the version across XBL calls. It doesn't seem like this should be an issue anymore, and it's just a debugging aid to boot. Let's kill it.
This commit is contained in:
parent
87d9ab415f
commit
f1be1a01ff
@ -21,27 +21,6 @@
|
|||||||
|
|
||||||
using namespace mozilla;
|
using namespace mozilla;
|
||||||
|
|
||||||
// Checks that the version is not modified in a given scope.
|
|
||||||
class AutoVersionChecker
|
|
||||||
{
|
|
||||||
DebugOnly<JSContext *> const cx;
|
|
||||||
DebugOnly<JSVersion> versionBefore;
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit AutoVersionChecker(JSContext *aCx) : cx(aCx) {
|
|
||||||
#ifdef DEBUG
|
|
||||||
versionBefore = JS_GetVersion(cx);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
~AutoVersionChecker() {
|
|
||||||
#ifdef DEBUG
|
|
||||||
JSVersion versionAfter = JS_GetVersion(cx);
|
|
||||||
NS_ABORT_IF_FALSE(versionAfter == versionBefore, "version must not change");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsXBLProtoImpl::InstallImplementation(nsXBLPrototypeBinding* aPrototypeBinding,
|
nsXBLProtoImpl::InstallImplementation(nsXBLPrototypeBinding* aPrototypeBinding,
|
||||||
nsXBLBinding* aBinding)
|
nsXBLBinding* aBinding)
|
||||||
@ -90,7 +69,6 @@ nsXBLProtoImpl::InstallImplementation(nsXBLPrototypeBinding* aPrototypeBinding,
|
|||||||
|
|
||||||
AutoPushJSContext cx(context->GetNativeContext());
|
AutoPushJSContext cx(context->GetNativeContext());
|
||||||
JSAutoCompartment ac(cx, targetClassObject);
|
JSAutoCompartment ac(cx, targetClassObject);
|
||||||
AutoVersionChecker avc(cx);
|
|
||||||
|
|
||||||
// Walk our member list and install each one in turn.
|
// Walk our member list and install each one in turn.
|
||||||
for (nsXBLProtoImplMember* curr = mMembers;
|
for (nsXBLProtoImplMember* curr = mMembers;
|
||||||
@ -230,8 +208,6 @@ nsXBLProtoImpl::CompilePrototypeMembers(nsXBLPrototypeBinding* aBinding)
|
|||||||
MOZ_ASSERT(classObject);
|
MOZ_ASSERT(classObject);
|
||||||
mClassObject = classObject;
|
mClassObject = classObject;
|
||||||
|
|
||||||
AutoVersionChecker avc(cx);
|
|
||||||
|
|
||||||
// Now that we have a class object installed, we walk our member list and compile each of our
|
// Now that we have a class object installed, we walk our member list and compile each of our
|
||||||
// properties and methods in turn.
|
// properties and methods in turn.
|
||||||
for (nsXBLProtoImplMember* curr = mMembers;
|
for (nsXBLProtoImplMember* curr = mMembers;
|
||||||
@ -300,7 +276,6 @@ nsXBLProtoImpl::FindField(const nsString& aFieldName) const
|
|||||||
bool
|
bool
|
||||||
nsXBLProtoImpl::ResolveAllFields(JSContext *cx, JS::Handle<JSObject*> obj) const
|
nsXBLProtoImpl::ResolveAllFields(JSContext *cx, JS::Handle<JSObject*> obj) const
|
||||||
{
|
{
|
||||||
AutoVersionChecker avc(cx);
|
|
||||||
for (nsXBLProtoImplField* f = mFields; f; f = f->GetNext()) {
|
for (nsXBLProtoImplField* f = mFields; f; f = f->GetNext()) {
|
||||||
// Using OBJ_LOOKUP_PROPERTY is a pain, since what we have is a
|
// Using OBJ_LOOKUP_PROPERTY is a pain, since what we have is a
|
||||||
// PRUnichar* for the property name. Let's just use the public API and
|
// PRUnichar* for the property name. Let's just use the public API and
|
||||||
|
Loading…
Reference in New Issue
Block a user