Cleaned up operator new and delete

content/html/style/src/nsCSSDeclaration.cpp

@@ -619,6 +619,8 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
   void* operator new(size_t size);
+
+  void operator delete(void* ptr, size_t size);
   
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
@@ -685,12 +687,18 @@ static PRInt32 gInstanceCount;
 
 void* CSSDeclarationImpl::operator new(size_t size)
 {
-  void* result = new char[size];
-
-  nsCRT::zero(result, size);
+  void* result = ::operator new(size);
+  if (result) {
+    nsCRT::zero(result, size);
+  }
   return result;
 }
 
+void CSSDeclarationImpl::operator delete(void* ptr, size_t size)
+{
+  ::operator delete(ptr);
+}
+
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {
   NS_INIT_REFCNT();

content/html/style/src/nsCSSStruct.cpp

@@ -619,6 +619,8 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
   void* operator new(size_t size);
+
+  void operator delete(void* ptr, size_t size);
   
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
@@ -685,12 +687,18 @@ static PRInt32 gInstanceCount;
 
 void* CSSDeclarationImpl::operator new(size_t size)
 {
-  void* result = new char[size];
-
-  nsCRT::zero(result, size);
+  void* result = ::operator new(size);
+  if (result) {
+    nsCRT::zero(result, size);
+  }
   return result;
 }
 
+void CSSDeclarationImpl::operator delete(void* ptr, size_t size)
+{
+  ::operator delete(ptr);
+}
+
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {
   NS_INIT_REFCNT();

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);
+  void operator delete(void* ptr, size_t size);
 
   CSSStyleRuleImpl(const nsCSSSelector& aSelector);
 
@@ -713,12 +713,12 @@ void* CSSStyleRuleImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void CSSStyleRuleImpl::operator delete(void* ptr)
+void CSSStyleRuleImpl::operator delete(void* ptr, size_t size)
 {
   CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*) ptr;
   if (nsnull != rule) {
     if (rule->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   CSSStyleSheetImpl();
 
@@ -753,12 +753,12 @@ void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void CSSStyleSheetImpl::operator delete(void* ptr)
+void CSSStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLAttributesImpl(nsIHTMLStyleSheet* aSheet, nsMapAttributesFunc aMapFunc);
   HTMLAttributesImpl(const HTMLAttributesImpl& aCopy);
@@ -282,12 +282,12 @@ void* HTMLAttributesImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLAttributesImpl::operator delete(void* ptr)
+void HTMLAttributesImpl::operator delete(void* ptr, size_t size)
 {
   HTMLAttributesImpl* attr = (HTMLAttributesImpl*) ptr;
   if (nsnull != attr) {
     if (attr->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLCSSStyleSheetImpl();
 
@@ -122,12 +122,12 @@ void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLCSSStyleSheetImpl::operator delete(void* ptr)
+void HTMLCSSStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLStyleSheetImpl(void);
 
@@ -335,12 +335,12 @@ void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLStyleSheetImpl::operator delete(void* ptr)
+void HTMLStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

layout/html/style/src/nsCSSDeclaration.cpp

@@ -619,6 +619,8 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
   void* operator new(size_t size);
+
+  void operator delete(void* ptr, size_t size);
   
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
@@ -685,12 +687,18 @@ static PRInt32 gInstanceCount;
 
 void* CSSDeclarationImpl::operator new(size_t size)
 {
-  void* result = new char[size];
-
-  nsCRT::zero(result, size);
+  void* result = ::operator new(size);
+  if (result) {
+    nsCRT::zero(result, size);
+  }
   return result;
 }
 
+void CSSDeclarationImpl::operator delete(void* ptr, size_t size)
+{
+  ::operator delete(ptr);
+}
+
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {
   NS_INIT_REFCNT();

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);
+  void operator delete(void* ptr, size_t size);
 
   CSSStyleRuleImpl(const nsCSSSelector& aSelector);
 
@@ -713,12 +713,12 @@ void* CSSStyleRuleImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void CSSStyleRuleImpl::operator delete(void* ptr)
+void CSSStyleRuleImpl::operator delete(void* ptr, size_t size)
 {
   CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*) ptr;
   if (nsnull != rule) {
     if (rule->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   CSSStyleSheetImpl();
 
@@ -753,12 +753,12 @@ void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void CSSStyleSheetImpl::operator delete(void* ptr)
+void CSSStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLAttributesImpl(nsIHTMLStyleSheet* aSheet, nsMapAttributesFunc aMapFunc);
   HTMLAttributesImpl(const HTMLAttributesImpl& aCopy);
@@ -282,12 +282,12 @@ void* HTMLAttributesImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLAttributesImpl::operator delete(void* ptr)
+void HTMLAttributesImpl::operator delete(void* ptr, size_t size)
 {
   HTMLAttributesImpl* attr = (HTMLAttributesImpl*) ptr;
   if (nsnull != attr) {
     if (attr->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLCSSStyleSheetImpl();
 
@@ -122,12 +122,12 @@ void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLCSSStyleSheetImpl::operator delete(void* ptr)
+void HTMLCSSStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLStyleSheetImpl(void);
 
@@ -335,12 +335,12 @@ void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLStyleSheetImpl::operator delete(void* ptr)
+void HTMLStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

layout/style/nsCSSDeclaration.cpp

@@ -619,6 +619,8 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
   void* operator new(size_t size);
+
+  void operator delete(void* ptr, size_t size);
   
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
@@ -685,12 +687,18 @@ static PRInt32 gInstanceCount;
 
 void* CSSDeclarationImpl::operator new(size_t size)
 {
-  void* result = new char[size];
-
-  nsCRT::zero(result, size);
+  void* result = ::operator new(size);
+  if (result) {
+    nsCRT::zero(result, size);
+  }
   return result;
 }
 
+void CSSDeclarationImpl::operator delete(void* ptr, size_t size)
+{
+  ::operator delete(ptr);
+}
+
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {
   NS_INIT_REFCNT();

layout/style/nsCSSStruct.cpp

@@ -619,6 +619,8 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
   void* operator new(size_t size);
+
+  void operator delete(void* ptr, size_t size);
   
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
@@ -685,12 +687,18 @@ static PRInt32 gInstanceCount;
 
 void* CSSDeclarationImpl::operator new(size_t size)
 {
-  void* result = new char[size];
-
-  nsCRT::zero(result, size);
+  void* result = ::operator new(size);
+  if (result) {
+    nsCRT::zero(result, size);
+  }
   return result;
 }
 
+void CSSDeclarationImpl::operator delete(void* ptr, size_t size)
+{
+  ::operator delete(ptr);
+}
+
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {
   NS_INIT_REFCNT();

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);
+  void operator delete(void* ptr, size_t size);
 
   CSSStyleRuleImpl(const nsCSSSelector& aSelector);
 
@@ -713,12 +713,12 @@ void* CSSStyleRuleImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void CSSStyleRuleImpl::operator delete(void* ptr)
+void CSSStyleRuleImpl::operator delete(void* ptr, size_t size)
 {
   CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*) ptr;
   if (nsnull != rule) {
     if (rule->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   CSSStyleSheetImpl();
 
@@ -753,12 +753,12 @@ void* CSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void CSSStyleSheetImpl::operator delete(void* ptr)
+void CSSStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   CSSStyleSheetImpl* sheet = (CSSStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLCSSStyleSheetImpl();
 
@@ -122,12 +122,12 @@ void* HTMLCSSStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLCSSStyleSheetImpl::operator delete(void* ptr)
+void HTMLCSSStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   HTMLCSSStyleSheetImpl* sheet = (HTMLCSSStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }

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);
+  void operator delete(void* ptr, size_t size);
 
   HTMLStyleSheetImpl(void);
 
@@ -335,12 +335,12 @@ void* HTMLStyleSheetImpl::operator new(size_t size, nsIArena* aArena)
   return (void*) rv;
 }
 
-void HTMLStyleSheetImpl::operator delete(void* ptr)
+void HTMLStyleSheetImpl::operator delete(void* ptr, size_t size)
 {
   HTMLStyleSheetImpl* sheet = (HTMLStyleSheetImpl*) ptr;
   if (nsnull != sheet) {
     if (sheet->mInHeap) {
-      ::delete ptr;
+      ::operator delete(ptr);
     }
   }
 }