From 8ca53a41da931c5df6a9b21f8128223830ad4d79 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 26 Feb 1999 19:26:29 +0000 Subject: [PATCH] Fixed remaining issues with operator new/delete git-svn-id: svn://10.0.0.236/trunk@22190 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleContext.cpp | 2 +- .../html/document/src/nsHTMLContentSink.cpp | 2 +- .../html/style/src/nsCSSDeclaration.cpp | 4 +- .../content/html/style/src/nsCSSStruct.cpp | 4 +- .../content/html/style/src/nsCSSStyleRule.cpp | 4 +- .../html/style/src/nsCSSStyleSheet.cpp | 4 +- .../html/style/src/nsHTMLAttributes.cpp | 4 +- .../html/style/src/nsHTMLCSSStyleSheet.cpp | 4 +- .../html/style/src/nsHTMLStyleSheet.cpp | 4 +- mozilla/layout/base/nsPresShell.cpp | 14 ++-- mozilla/layout/base/src/nsPresContext.h | 2 +- mozilla/layout/base/src/nsStyleContext.cpp | 2 +- mozilla/layout/generic/nsFrame.cpp | 2 +- mozilla/layout/generic/nsFrame.h | 2 +- .../layout/generic/nsHTMLContainerFrame.cpp | 64 ------------------- mozilla/layout/generic/nsHTMLContainerFrame.h | 19 ------ mozilla/layout/html/base/src/nsFrame.cpp | 2 +- mozilla/layout/html/base/src/nsFrame.h | 2 +- .../html/base/src/nsHTMLContainerFrame.cpp | 64 ------------------- .../html/base/src/nsHTMLContainerFrame.h | 19 ------ mozilla/layout/html/base/src/nsPresShell.cpp | 14 ++-- .../html/document/src/nsHTMLContentSink.cpp | 2 +- .../html/style/src/nsCSSDeclaration.cpp | 4 +- .../layout/html/style/src/nsCSSStyleRule.cpp | 4 +- .../layout/html/style/src/nsCSSStyleSheet.cpp | 4 +- .../html/style/src/nsHTMLAttributes.cpp | 4 +- .../html/style/src/nsHTMLCSSStyleSheet.cpp | 4 +- .../html/style/src/nsHTMLStyleSheet.cpp | 4 +- mozilla/layout/style/nsCSSDeclaration.cpp | 4 +- mozilla/layout/style/nsCSSStruct.cpp | 4 +- mozilla/layout/style/nsCSSStyleRule.cpp | 4 +- mozilla/layout/style/nsCSSStyleSheet.cpp | 4 +- mozilla/layout/style/nsHTMLCSSStyleSheet.cpp | 4 +- mozilla/layout/style/nsHTMLStyleSheet.cpp | 4 +- mozilla/layout/style/nsStyleContext.cpp | 2 +- 35 files changed, 64 insertions(+), 226 deletions(-) diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index 0b6a2837195..4e03accc48f 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -699,7 +699,7 @@ public: return rv; } - void operator delete(void* ptr, size_t size) { + void operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index 46734d1dd0d..80792e48a45 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -147,7 +147,7 @@ public: return rv; } - void operator delete(void* ptr, size_t size) { + void operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index 1b88c4d93f2..74a9b9ffadf 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -620,7 +620,7 @@ class CSSDeclarationImpl : public nsICSSDeclaration { public: void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSDeclarationImpl(void); virtual ~CSSDeclarationImpl(void); @@ -694,7 +694,7 @@ void* CSSDeclarationImpl::operator new(size_t size) return result; } -void CSSDeclarationImpl::operator delete(void* ptr, size_t size) +void CSSDeclarationImpl::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index 1b88c4d93f2..74a9b9ffadf 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/content/html/style/src/nsCSSStruct.cpp @@ -620,7 +620,7 @@ class CSSDeclarationImpl : public nsICSSDeclaration { public: void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSDeclarationImpl(void); virtual ~CSSDeclarationImpl(void); @@ -694,7 +694,7 @@ void* CSSDeclarationImpl::operator new(size_t size) return result; } -void CSSDeclarationImpl::operator delete(void* ptr, size_t size) +void CSSDeclarationImpl::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index 0396942f5de..e5c805f7649 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -613,7 +613,7 @@ class CSSStyleRuleImpl : public nsICSSStyleRule, public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSStyleRuleImpl(const nsCSSSelector& aSelector); @@ -713,7 +713,7 @@ void* CSSStyleRuleImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void CSSStyleRuleImpl::operator delete(void* ptr, size_t size) +void CSSStyleRuleImpl::operator delete(void* ptr) { CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*) ptr; if (nsnull != rule) { diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 75ae27a559a..eb65b8db156 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -621,7 +621,7 @@ class CSSStyleSheetImpl : public nsICSSStyleSheet, public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSStyleSheetImpl(); @@ -753,7 +753,7 @@ void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void CSSStyleSheetImpl::operator delete(void* ptr, size_t size) +void CSSStyleSheetImpl::operator delete(void* ptr) { CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp index 6b247a9d917..bae6cb92862 100644 --- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/content/html/style/src/nsHTMLAttributes.cpp @@ -181,7 +181,7 @@ class HTMLAttributesImpl: public nsIHTMLAttributes, public nsIStyleRule { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLAttributesImpl(nsIHTMLStyleSheet* aSheet, nsMapAttributesFunc aMapFunc); HTMLAttributesImpl(const HTMLAttributesImpl& aCopy); @@ -282,7 +282,7 @@ void* HTMLAttributesImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLAttributesImpl::operator delete(void* ptr, size_t size) +void HTMLAttributesImpl::operator delete(void* ptr) { HTMLAttributesImpl* attr = (HTMLAttributesImpl*) ptr; if (nsnull != attr) { diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp index 7be41035d67..e32f7701171 100644 --- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -41,7 +41,7 @@ class HTMLCSSStyleSheetImpl : public nsIHTMLCSSStyleSheet { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLCSSStyleSheetImpl(); @@ -122,7 +122,7 @@ void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLCSSStyleSheetImpl::operator delete(void* ptr, size_t size) +void HTMLCSSStyleSheetImpl::operator delete(void* ptr) { HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index e5d8c2d0412..565948d58f0 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -225,7 +225,7 @@ class HTMLStyleSheetImpl : public nsIHTMLStyleSheet { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLStyleSheetImpl(void); @@ -335,7 +335,7 @@ void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLStyleSheetImpl::operator delete(void* ptr, size_t size) +void HTMLStyleSheetImpl::operator delete(void* ptr) { HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index cc5cf943b06..e74ceb6a3ed 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -190,14 +190,16 @@ class PresShell : public nsIPresShell, public nsIViewObserver, public: PresShell(); - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; + void* operator new(size_t size) { + void* result = ::operator new(size); + if (result) { + nsCRT::zero(result, size); + } + return result; } - void operator delete(void* ptr, size_t size) { - delete [] ptr; + void operator delete(void* ptr) { + ::operator delete(ptr); } // nsISupports diff --git a/mozilla/layout/base/src/nsPresContext.h b/mozilla/layout/base/src/nsPresContext.h index 7ad502f15c9..d5737c6c313 100644 --- a/mozilla/layout/base/src/nsPresContext.h +++ b/mozilla/layout/base/src/nsPresContext.h @@ -36,7 +36,7 @@ public: return rv; } - void operator delete(void* ptr, size_t size) { + void operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index 0b6a2837195..4e03accc48f 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -699,7 +699,7 @@ public: return rv; } - void operator delete(void* ptr, size_t size) { + void operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 5247c0a5c49..6063dbd92bc 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -168,7 +168,7 @@ void* nsFrame::operator new(size_t size) return result; } -void nsFrame::operator delete(void* ptr, size_t size) +void nsFrame::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index c7dac5b0b6a..5b5494ca9b2 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -106,7 +106,7 @@ public: // Overloaded new operator. Initializes the memory to 0 void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); // nsISupports NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index bfb5247fa37..b608f89837c 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -79,70 +79,6 @@ nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext, return NS_OK; } -nsPlaceholderFrame* -nsHTMLContainerFrame::CreatePlaceholderFrame(nsIPresContext& aPresContext, - nsIFrame* aFloatedFrame) -{ - nsIContent* content; - aFloatedFrame->GetContent(&content); - - nsPlaceholderFrame* placeholder; - NS_NewPlaceholderFrame((nsIFrame**)&placeholder); - - // The placeholder frame gets a pseudo style context - nsIStyleContext* kidSC; - aFloatedFrame->GetStyleContext(&kidSC); - nsIStyleContext* placeholderPseudoStyle; - aPresContext.ResolvePseudoStyleContextFor(content, - nsHTMLAtoms::placeholderPseudo, - kidSC, PR_FALSE, - &placeholderPseudoStyle); - NS_RELEASE(kidSC); - placeholder->Init(aPresContext, content, this, placeholderPseudoStyle, nsnull); - NS_RELEASE(placeholderPseudoStyle); - NS_IF_RELEASE(content); - - placeholder->SetAnchoredItem(aFloatedFrame); - return placeholder; -} - -#if 0 -// XXX pass in aFrame's style context instead -PRBool -nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext, - nsIFrame* aFrame, - const nsStyleDisplay* aDisplay, - const nsStylePosition* aPosition, - nsIFrame*& aPlaceholderFrame) -{ - // Initialize OUT parameter - aPlaceholderFrame = nsnull; - - // See if the element wants to be floated - PRBool isFloated = (NS_STYLE_FLOAT_LEFT == aDisplay->mFloats) || - (NS_STYLE_FLOAT_RIGHT == aDisplay->mFloats); - - if (isFloated) { - nsIFrame* nextSibling; - - // Set aFrame's next sibling to nsnull, and remember the current next - // sibling pointer - aFrame->GetNextSibling(&nextSibling); - aFrame->SetNextSibling(nsnull); - - // Create a placeholder frame that will serve as the anchor point. - nsPlaceholderFrame* placeholder = CreatePlaceholderFrame(aPresContext, aFrame); - aPlaceholderFrame = placeholder; - - // Set the placeholder's next sibling to what aFrame's next sibling was - aPlaceholderFrame->SetNextSibling(nextSibling); - return PR_TRUE; - } - - return PR_FALSE; -} -#endif - /** * Create a next-in-flow for aFrame. Will return the newly created * frame in aNextInFlowResult if and only if a new frame is diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.h b/mozilla/layout/generic/nsHTMLContainerFrame.h index 64eeb9d090b..aabd398bb12 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.h +++ b/mozilla/layout/generic/nsHTMLContainerFrame.h @@ -34,25 +34,6 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); - nsPlaceholderFrame* CreatePlaceholderFrame(nsIPresContext& aPresContext, - nsIFrame* aFloatedFrame); - - // If the frame should be floated or absolutely positioned creates a - // placeholder frame and returns PR_TRUE. The sibling list is - // modified so aFrame's next sibling pointer is set to nsnull, and - // aPlaceholderFrame's sibling pointer is set to what aFrame's - // sibling pointer was. It's up to the caller to adjust any previous - // sibling pointers. - // XXX bad api - need nsresult in case we attempt to move out of the - // flow and run out of memory -#if 0 - PRBool MoveFrameOutOfFlow(nsIPresContext& aPresContext, - nsIFrame* aFrame, - const nsStyleDisplay* aDisplay, - const nsStylePosition* aPosition, - nsIFrame*& aPlaceholderFrame); -#endif - /** * Helper method to create next-in-flows if necessary. If aFrame * already has a next-in-flow then this method does diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 5247c0a5c49..6063dbd92bc 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -168,7 +168,7 @@ void* nsFrame::operator new(size_t size) return result; } -void nsFrame::operator delete(void* ptr, size_t size) +void nsFrame::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index c7dac5b0b6a..5b5494ca9b2 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -106,7 +106,7 @@ public: // Overloaded new operator. Initializes the memory to 0 void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); // nsISupports NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index bfb5247fa37..b608f89837c 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -79,70 +79,6 @@ nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext, return NS_OK; } -nsPlaceholderFrame* -nsHTMLContainerFrame::CreatePlaceholderFrame(nsIPresContext& aPresContext, - nsIFrame* aFloatedFrame) -{ - nsIContent* content; - aFloatedFrame->GetContent(&content); - - nsPlaceholderFrame* placeholder; - NS_NewPlaceholderFrame((nsIFrame**)&placeholder); - - // The placeholder frame gets a pseudo style context - nsIStyleContext* kidSC; - aFloatedFrame->GetStyleContext(&kidSC); - nsIStyleContext* placeholderPseudoStyle; - aPresContext.ResolvePseudoStyleContextFor(content, - nsHTMLAtoms::placeholderPseudo, - kidSC, PR_FALSE, - &placeholderPseudoStyle); - NS_RELEASE(kidSC); - placeholder->Init(aPresContext, content, this, placeholderPseudoStyle, nsnull); - NS_RELEASE(placeholderPseudoStyle); - NS_IF_RELEASE(content); - - placeholder->SetAnchoredItem(aFloatedFrame); - return placeholder; -} - -#if 0 -// XXX pass in aFrame's style context instead -PRBool -nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext, - nsIFrame* aFrame, - const nsStyleDisplay* aDisplay, - const nsStylePosition* aPosition, - nsIFrame*& aPlaceholderFrame) -{ - // Initialize OUT parameter - aPlaceholderFrame = nsnull; - - // See if the element wants to be floated - PRBool isFloated = (NS_STYLE_FLOAT_LEFT == aDisplay->mFloats) || - (NS_STYLE_FLOAT_RIGHT == aDisplay->mFloats); - - if (isFloated) { - nsIFrame* nextSibling; - - // Set aFrame's next sibling to nsnull, and remember the current next - // sibling pointer - aFrame->GetNextSibling(&nextSibling); - aFrame->SetNextSibling(nsnull); - - // Create a placeholder frame that will serve as the anchor point. - nsPlaceholderFrame* placeholder = CreatePlaceholderFrame(aPresContext, aFrame); - aPlaceholderFrame = placeholder; - - // Set the placeholder's next sibling to what aFrame's next sibling was - aPlaceholderFrame->SetNextSibling(nextSibling); - return PR_TRUE; - } - - return PR_FALSE; -} -#endif - /** * Create a next-in-flow for aFrame. Will return the newly created * frame in aNextInFlowResult if and only if a new frame is diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.h b/mozilla/layout/html/base/src/nsHTMLContainerFrame.h index 64eeb9d090b..aabd398bb12 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.h +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.h @@ -34,25 +34,6 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); - nsPlaceholderFrame* CreatePlaceholderFrame(nsIPresContext& aPresContext, - nsIFrame* aFloatedFrame); - - // If the frame should be floated or absolutely positioned creates a - // placeholder frame and returns PR_TRUE. The sibling list is - // modified so aFrame's next sibling pointer is set to nsnull, and - // aPlaceholderFrame's sibling pointer is set to what aFrame's - // sibling pointer was. It's up to the caller to adjust any previous - // sibling pointers. - // XXX bad api - need nsresult in case we attempt to move out of the - // flow and run out of memory -#if 0 - PRBool MoveFrameOutOfFlow(nsIPresContext& aPresContext, - nsIFrame* aFrame, - const nsStyleDisplay* aDisplay, - const nsStylePosition* aPosition, - nsIFrame*& aPlaceholderFrame); -#endif - /** * Helper method to create next-in-flows if necessary. If aFrame * already has a next-in-flow then this method does diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index cc5cf943b06..e74ceb6a3ed 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -190,14 +190,16 @@ class PresShell : public nsIPresShell, public nsIViewObserver, public: PresShell(); - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; + void* operator new(size_t size) { + void* result = ::operator new(size); + if (result) { + nsCRT::zero(result, size); + } + return result; } - void operator delete(void* ptr, size_t size) { - delete [] ptr; + void operator delete(void* ptr) { + ::operator delete(ptr); } // nsISupports diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index 46734d1dd0d..80792e48a45 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -147,7 +147,7 @@ public: return rv; } - void operator delete(void* ptr, size_t size) { + void operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp index 1b88c4d93f2..74a9b9ffadf 100644 --- a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp @@ -620,7 +620,7 @@ class CSSDeclarationImpl : public nsICSSDeclaration { public: void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSDeclarationImpl(void); virtual ~CSSDeclarationImpl(void); @@ -694,7 +694,7 @@ void* CSSDeclarationImpl::operator new(size_t size) return result; } -void CSSDeclarationImpl::operator delete(void* ptr, size_t size) +void CSSDeclarationImpl::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index 0396942f5de..e5c805f7649 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -613,7 +613,7 @@ class CSSStyleRuleImpl : public nsICSSStyleRule, public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSStyleRuleImpl(const nsCSSSelector& aSelector); @@ -713,7 +713,7 @@ void* CSSStyleRuleImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void CSSStyleRuleImpl::operator delete(void* ptr, size_t size) +void CSSStyleRuleImpl::operator delete(void* ptr) { CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*) ptr; if (nsnull != rule) { diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp index 75ae27a559a..eb65b8db156 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp @@ -621,7 +621,7 @@ class CSSStyleSheetImpl : public nsICSSStyleSheet, public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSStyleSheetImpl(); @@ -753,7 +753,7 @@ void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void CSSStyleSheetImpl::operator delete(void* ptr, size_t size) +void CSSStyleSheetImpl::operator delete(void* ptr) { CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp index 6b247a9d917..bae6cb92862 100644 --- a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp @@ -181,7 +181,7 @@ class HTMLAttributesImpl: public nsIHTMLAttributes, public nsIStyleRule { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLAttributesImpl(nsIHTMLStyleSheet* aSheet, nsMapAttributesFunc aMapFunc); HTMLAttributesImpl(const HTMLAttributesImpl& aCopy); @@ -282,7 +282,7 @@ void* HTMLAttributesImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLAttributesImpl::operator delete(void* ptr, size_t size) +void HTMLAttributesImpl::operator delete(void* ptr) { HTMLAttributesImpl* attr = (HTMLAttributesImpl*) ptr; if (nsnull != attr) { diff --git a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp index 7be41035d67..e32f7701171 100644 --- a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -41,7 +41,7 @@ class HTMLCSSStyleSheetImpl : public nsIHTMLCSSStyleSheet { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLCSSStyleSheetImpl(); @@ -122,7 +122,7 @@ void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLCSSStyleSheetImpl::operator delete(void* ptr, size_t size) +void HTMLCSSStyleSheetImpl::operator delete(void* ptr) { HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp index e5d8c2d0412..565948d58f0 100644 --- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp @@ -225,7 +225,7 @@ class HTMLStyleSheetImpl : public nsIHTMLStyleSheet { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLStyleSheetImpl(void); @@ -335,7 +335,7 @@ void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLStyleSheetImpl::operator delete(void* ptr, size_t size) +void HTMLStyleSheetImpl::operator delete(void* ptr) { HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index 1b88c4d93f2..74a9b9ffadf 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -620,7 +620,7 @@ class CSSDeclarationImpl : public nsICSSDeclaration { public: void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSDeclarationImpl(void); virtual ~CSSDeclarationImpl(void); @@ -694,7 +694,7 @@ void* CSSDeclarationImpl::operator new(size_t size) return result; } -void CSSDeclarationImpl::operator delete(void* ptr, size_t size) +void CSSDeclarationImpl::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index 1b88c4d93f2..74a9b9ffadf 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/layout/style/nsCSSStruct.cpp @@ -620,7 +620,7 @@ class CSSDeclarationImpl : public nsICSSDeclaration { public: void* operator new(size_t size); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSDeclarationImpl(void); virtual ~CSSDeclarationImpl(void); @@ -694,7 +694,7 @@ void* CSSDeclarationImpl::operator new(size_t size) return result; } -void CSSDeclarationImpl::operator delete(void* ptr, size_t size) +void CSSDeclarationImpl::operator delete(void* ptr) { ::operator delete(ptr); } diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 0396942f5de..e5c805f7649 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -613,7 +613,7 @@ class CSSStyleRuleImpl : public nsICSSStyleRule, public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSStyleRuleImpl(const nsCSSSelector& aSelector); @@ -713,7 +713,7 @@ void* CSSStyleRuleImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void CSSStyleRuleImpl::operator delete(void* ptr, size_t size) +void CSSStyleRuleImpl::operator delete(void* ptr) { CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*) ptr; if (nsnull != rule) { diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 75ae27a559a..eb65b8db156 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -621,7 +621,7 @@ class CSSStyleSheetImpl : public nsICSSStyleSheet, public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); CSSStyleSheetImpl(); @@ -753,7 +753,7 @@ void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void CSSStyleSheetImpl::operator delete(void* ptr, size_t size) +void CSSStyleSheetImpl::operator delete(void* ptr) { CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp index 7be41035d67..e32f7701171 100644 --- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp @@ -41,7 +41,7 @@ class HTMLCSSStyleSheetImpl : public nsIHTMLCSSStyleSheet { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLCSSStyleSheetImpl(); @@ -122,7 +122,7 @@ void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLCSSStyleSheetImpl::operator delete(void* ptr, size_t size) +void HTMLCSSStyleSheetImpl::operator delete(void* ptr) { HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp index e5d8c2d0412..565948d58f0 100644 --- a/mozilla/layout/style/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp @@ -225,7 +225,7 @@ class HTMLStyleSheetImpl : public nsIHTMLStyleSheet { public: void* operator new(size_t size); void* operator new(size_t size, nsIArena* aArena); - void operator delete(void* ptr, size_t size); + void operator delete(void* ptr); HTMLStyleSheetImpl(void); @@ -335,7 +335,7 @@ void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena) return (void*) rv; } -void HTMLStyleSheetImpl::operator delete(void* ptr, size_t size) +void HTMLStyleSheetImpl::operator delete(void* ptr) { HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr; if (nsnull != sheet) { diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index 0b6a2837195..4e03accc48f 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -699,7 +699,7 @@ public: return rv; } - void operator delete(void* ptr, size_t size) { + void operator delete(void* ptr) { ::operator delete(ptr); }