Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused ability to optionally arena-allocate certain stylesheet objects. b=174256 r=kin sr=bzbarsky a=rjesup

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@131998 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu 2002-10-14 23:57:17 +00:00
parent 795925d5f4
commit 521000f98f
10 changed files with 30 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mozilla/content/html/style/src/nsCSSRule.cpp
View File

@ -40,40 +40,6 @@
#include "nsIArena.h"
#include "nsICSSStyleSheet.h"
void* nsCSSRule::operator new(size_t size) CPP_THROW_NEW
{
nsCSSRule* rv = (nsCSSRule*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* nsCSSRule::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
nsCSSRule* rv = (nsCSSRule*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void nsCSSRule::operator delete(void* ptr)
{
nsCSSRule* rule = (nsCSSRule*) ptr;
if (nsnull != rule) {
if (rule->mInHeap) {
::operator delete(ptr);
}
}
}
nsCSSRule::nsCSSRule(void)
: mRefCnt(0),
mSheet(nsnull),
@ -98,6 +64,13 @@ nsCSSRule::~nsCSSRule(void)
NS_IMPL_ADDREF(nsCSSRule)
NS_IMPL_RELEASE(nsCSSRule)
NS_IMETHODIMP
nsCSSRule::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
NS_NOTREACHED("nsCSSRule::QueryInterface");
return NS_NOINTERFACE;
}
NS_IMETHODIMP
nsCSSRule::GetStyleSheet(nsIStyleSheet*& aSheet) const
{
@ -129,5 +102,7 @@ nsCSSRule::SetParentRule(nsICSSGroupRule* aRule)
NS_IMETHODIMP
nsCSSRule::MapRuleInfoInto(nsRuleData* aRuleData)
{
// The nsIStyleRule contract is not appropriate for all CSS rules.
NS_NOTREACHED("nsCSSRule::MapRuleInfoInto");
return NS_OK;
}

11
mozilla/content/html/style/src/nsCSSRule.h
View File

@ -49,16 +49,11 @@ class nsICSSGroupRule;
class nsCSSRule {
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
nsCSSRule(void);
nsCSSRule(const nsCSSRule& aCopy);
virtual ~nsCSSRule(void);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aSheet) const;
NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet);
@ -70,10 +65,6 @@ public:
NS_IMETHOD MapRuleInfoInto(nsRuleData* aRuleData);
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsICSSStyleSheet* mSheet;
nsICSSGroupRule* mParentRule;
#ifdef DEBUG_REFS

50
mozilla/content/html/style/src/nsCSSStyleSheet.cpp
View File

@ -821,15 +821,9 @@ class CSSStyleSheetImpl : public nsICSSStyleSheet,
public nsICSSLoaderObserver
{
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
CSSStyleSheetImpl();
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
// basic style sheet data
NS_IMETHOD Init(nsIURI* aURL);
@ -922,10 +916,6 @@ protected:
void DidDirty(void);
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsString mTitle;
DOMMediaListImpl* mMedia;
CSSStyleSheetImpl* mFirstChild;
@ -1729,40 +1719,6 @@ void CSSStyleSheetInner::SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSiz
// CSS Style Sheet
//
void* CSSStyleSheetImpl::operator new(size_t size) CPP_THROW_NEW
{
CSSStyleSheetImpl* rv = (CSSStyleSheetImpl*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
CSSStyleSheetImpl* rv = (CSSStyleSheetImpl*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void CSSStyleSheetImpl::operator delete(void* ptr)
{
CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr;
if (nsnull != sheet) {
if (sheet->mInHeap) {
::operator delete(ptr);
}
}
}
MOZ_DECL_CTOR_COUNTER(CSSStyleSheetImpl)
CSSStyleSheetImpl::CSSStyleSheetImpl()
@ -3955,8 +3911,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
} while (result && (nsnull != attr));
}
}
if (result &&
((nsnull != aSelector->mIDList) || (nsnull != aSelector->mClassList))) { // test for ID & class match
if (result && (aSelector->mIDList || aSelector->mClassList)) {
// test for ID & class match
result = localFalse;
if (data.mStyledContent) {
// case sensitivity: bug 93371

46
mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
View File

@ -186,15 +186,9 @@ CSSFirstLetterRule::CSSFirstLetterRule(nsIHTMLCSSStyleSheet* aSheet)
class HTMLCSSStyleSheetImpl : public nsIHTMLCSSStyleSheet,
public nsIStyleRuleProcessor {
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
HTMLCSSStyleSheetImpl();
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
// basic style sheet data
NS_IMETHOD Init(nsIURI* aURL, nsIDocument* aDocument);
@ -249,10 +243,6 @@ protected:
virtual ~HTMLCSSStyleSheetImpl();
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsIURI* mURL;
nsIDocument* mDocument;
@ -261,40 +251,6 @@ protected:
};
void* HTMLCSSStyleSheetImpl::operator new(size_t size) CPP_THROW_NEW
{
HTMLCSSStyleSheetImpl* rv = (HTMLCSSStyleSheetImpl*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
HTMLCSSStyleSheetImpl* rv = (HTMLCSSStyleSheetImpl*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void HTMLCSSStyleSheetImpl::operator delete(void* ptr)
{
HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr;
if (nsnull != sheet) {
if (sheet->mInHeap) {
::operator delete(ptr);
}
}
}
HTMLCSSStyleSheetImpl::HTMLCSSStyleSheetImpl()
: nsIHTMLCSSStyleSheet(),
mRefCnt(0),

46
mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -732,16 +732,10 @@ static PLDHashTableOps MappedAttrTable_Ops = {
class HTMLStyleSheetImpl : public nsIHTMLStyleSheet,
public nsIStyleRuleProcessor {
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
HTMLStyleSheetImpl(void);
nsresult Init();
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
// nsIStyleSheet api
NS_IMETHOD GetURL(nsIURI*& aURL) const;
@ -808,10 +802,6 @@ protected:
virtual ~HTMLStyleSheetImpl();
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsIURI* mURL;
nsIDocument* mDocument;
HTMLColorRule* mLinkRule;
@ -830,40 +820,6 @@ protected:
};
void* HTMLStyleSheetImpl::operator new(size_t size) CPP_THROW_NEW
{
HTMLStyleSheetImpl* rv = (HTMLStyleSheetImpl*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
HTMLStyleSheetImpl* rv = (HTMLStyleSheetImpl*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void HTMLStyleSheetImpl::operator delete(void* ptr)
{
HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr;
if (nsnull != sheet) {
if (sheet->mInHeap) {
::operator delete(ptr);
}
}
}
HTMLStyleSheetImpl::HTMLStyleSheetImpl(void)
: nsIHTMLStyleSheet(),
mRefCnt(0),

43
mozilla/layout/style/nsCSSRule.cpp
View File

@ -40,40 +40,6 @@
#include "nsIArena.h"
#include "nsICSSStyleSheet.h"
void* nsCSSRule::operator new(size_t size) CPP_THROW_NEW
{
nsCSSRule* rv = (nsCSSRule*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* nsCSSRule::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
nsCSSRule* rv = (nsCSSRule*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void nsCSSRule::operator delete(void* ptr)
{
nsCSSRule* rule = (nsCSSRule*) ptr;
if (nsnull != rule) {
if (rule->mInHeap) {
::operator delete(ptr);
}
}
}
nsCSSRule::nsCSSRule(void)
: mRefCnt(0),
mSheet(nsnull),
@ -98,6 +64,13 @@ nsCSSRule::~nsCSSRule(void)
NS_IMPL_ADDREF(nsCSSRule)
NS_IMPL_RELEASE(nsCSSRule)
NS_IMETHODIMP
nsCSSRule::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
NS_NOTREACHED("nsCSSRule::QueryInterface");
return NS_NOINTERFACE;
}
NS_IMETHODIMP
nsCSSRule::GetStyleSheet(nsIStyleSheet*& aSheet) const
{
@ -129,5 +102,7 @@ nsCSSRule::SetParentRule(nsICSSGroupRule* aRule)
NS_IMETHODIMP
nsCSSRule::MapRuleInfoInto(nsRuleData* aRuleData)
{
// The nsIStyleRule contract is not appropriate for all CSS rules.
NS_NOTREACHED("nsCSSRule::MapRuleInfoInto");
return NS_OK;
}

11
mozilla/layout/style/nsCSSRule.h
View File

@ -49,16 +49,11 @@ class nsICSSGroupRule;
class nsCSSRule {
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
nsCSSRule(void);
nsCSSRule(const nsCSSRule& aCopy);
virtual ~nsCSSRule(void);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aSheet) const;
NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet);
@ -70,10 +65,6 @@ public:
NS_IMETHOD MapRuleInfoInto(nsRuleData* aRuleData);
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsICSSStyleSheet* mSheet;
nsICSSGroupRule* mParentRule;
#ifdef DEBUG_REFS

50
mozilla/layout/style/nsCSSStyleSheet.cpp
View File

@ -821,15 +821,9 @@ class CSSStyleSheetImpl : public nsICSSStyleSheet,
public nsICSSLoaderObserver
{
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
CSSStyleSheetImpl();
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
// basic style sheet data
NS_IMETHOD Init(nsIURI* aURL);
@ -922,10 +916,6 @@ protected:
void DidDirty(void);
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsString mTitle;
DOMMediaListImpl* mMedia;
CSSStyleSheetImpl* mFirstChild;
@ -1729,40 +1719,6 @@ void CSSStyleSheetInner::SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSiz
// CSS Style Sheet
//
void* CSSStyleSheetImpl::operator new(size_t size) CPP_THROW_NEW
{
CSSStyleSheetImpl* rv = (CSSStyleSheetImpl*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
CSSStyleSheetImpl* rv = (CSSStyleSheetImpl*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void CSSStyleSheetImpl::operator delete(void* ptr)
{
CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr;
if (nsnull != sheet) {
if (sheet->mInHeap) {
::operator delete(ptr);
}
}
}
MOZ_DECL_CTOR_COUNTER(CSSStyleSheetImpl)
CSSStyleSheetImpl::CSSStyleSheetImpl()
@ -3955,8 +3911,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
} while (result && (nsnull != attr));
}
}
if (result &&
((nsnull != aSelector->mIDList) || (nsnull != aSelector->mClassList))) { // test for ID & class match
if (result && (aSelector->mIDList || aSelector->mClassList)) {
// test for ID & class match
result = localFalse;
if (data.mStyledContent) {
// case sensitivity: bug 93371

46
mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
View File

@ -186,15 +186,9 @@ CSSFirstLetterRule::CSSFirstLetterRule(nsIHTMLCSSStyleSheet* aSheet)
class HTMLCSSStyleSheetImpl : public nsIHTMLCSSStyleSheet,
public nsIStyleRuleProcessor {
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
HTMLCSSStyleSheetImpl();
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
// basic style sheet data
NS_IMETHOD Init(nsIURI* aURL, nsIDocument* aDocument);
@ -249,10 +243,6 @@ protected:
virtual ~HTMLCSSStyleSheetImpl();
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsIURI* mURL;
nsIDocument* mDocument;
@ -261,40 +251,6 @@ protected:
};
void* HTMLCSSStyleSheetImpl::operator new(size_t size) CPP_THROW_NEW
{
HTMLCSSStyleSheetImpl* rv = (HTMLCSSStyleSheetImpl*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
HTMLCSSStyleSheetImpl* rv = (HTMLCSSStyleSheetImpl*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void HTMLCSSStyleSheetImpl::operator delete(void* ptr)
{
HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr;
if (nsnull != sheet) {
if (sheet->mInHeap) {
::operator delete(ptr);
}
}
}
HTMLCSSStyleSheetImpl::HTMLCSSStyleSheetImpl()
: nsIHTMLCSSStyleSheet(),
mRefCnt(0),

46
mozilla/layout/style/nsHTMLStyleSheet.cpp
View File

@ -732,16 +732,10 @@ static PLDHashTableOps MappedAttrTable_Ops = {
class HTMLStyleSheetImpl : public nsIHTMLStyleSheet,
public nsIStyleRuleProcessor {
public:
void* operator new(size_t size) CPP_THROW_NEW;
void* operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW;
void operator delete(void* ptr);
HTMLStyleSheetImpl(void);
nsresult Init();
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef();
NS_IMETHOD_(nsrefcnt) Release();
NS_DECL_ISUPPORTS
// nsIStyleSheet api
NS_IMETHOD GetURL(nsIURI*& aURL) const;
@ -808,10 +802,6 @@ protected:
virtual ~HTMLStyleSheetImpl();
protected:
PRUint32 mInHeap : 1;
PRUint32 mRefCnt : 31;
NS_DECL_OWNINGTHREAD // for thread-safety checking
nsIURI* mURL;
nsIDocument* mDocument;
HTMLColorRule* mLinkRule;
@ -830,40 +820,6 @@ protected:
};
void* HTMLStyleSheetImpl::operator new(size_t size) CPP_THROW_NEW
{
HTMLStyleSheetImpl* rv = (HTMLStyleSheetImpl*) ::operator new(size);
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 1;
return (void*) rv;
}
void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena) CPP_THROW_NEW
{
HTMLStyleSheetImpl* rv = (HTMLStyleSheetImpl*) aArena->Alloc(PRInt32(size));
#ifdef NS_DEBUG
if (nsnull != rv) {
memset(rv, 0xEE, size);
}
#endif
rv->mInHeap = 0;
return (void*) rv;
}
void HTMLStyleSheetImpl::operator delete(void* ptr)
{
HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr;
if (nsnull != sheet) {
if (sheet->mInHeap) {
::operator delete(ptr);
}
}
}
HTMLStyleSheetImpl::HTMLStyleSheetImpl(void)
: nsIHTMLStyleSheet(),
mRefCnt(0),