Bug 746285 - pack nsXBLBinding more carefully for 64-bit; r=bz

This commit is contained in:
Nathan Froyd 2012-04-17 15:23:11 -04:00
parent 57bc1add80
commit a619fcd8c8
2 changed files with 7 additions and 7 deletions

View File

@ -255,10 +255,10 @@ nsXBLJSClass::Destroy()
// Constructors/Destructors
nsXBLBinding::nsXBLBinding(nsXBLPrototypeBinding* aBinding)
: mPrototypeBinding(aBinding),
mInsertionPointTable(nsnull),
mIsStyleBinding(true),
mMarkedForDeath(false)
: mIsStyleBinding(true),
mMarkedForDeath(false),
mPrototypeBinding(aBinding),
mInsertionPointTable(nsnull)
{
NS_ASSERTION(mPrototypeBinding, "Must have a prototype binding!");
// Grab a ref to the document info so the prototype binding won't die

View File

@ -156,6 +156,9 @@ public:
// MEMBER VARIABLES
protected:
bool mIsStyleBinding;
bool mMarkedForDeath;
nsXBLPrototypeBinding* mPrototypeBinding; // Weak, but we're holding a ref to the docinfo
nsCOMPtr<nsIContent> mContent; // Strong. Our anonymous content stays around with us.
nsRefPtr<nsXBLBinding> mNextBinding; // Strong. The derived binding owns the base class bindings.
@ -164,9 +167,6 @@ protected:
// A hash from nsIContent* -> (a sorted array of nsXBLInsertionPoint)
nsClassHashtable<nsISupportsHashKey, nsInsertionPointList>* mInsertionPointTable;
bool mIsStyleBinding;
bool mMarkedForDeath;
};
#endif // nsXBLBinding_h_