Remove nsISizeOfHandler and associated SizeOf methods. b=106792 r=bzbarsky sr=jst
git-svn-id: svn://10.0.0.236/trunk@138193 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -52,7 +52,6 @@
|
||||
|
||||
#ifndef RICKG_TESTBED
|
||||
#include "prdtoa.h"
|
||||
#include "nsISizeOfHandler.h"
|
||||
#endif
|
||||
|
||||
static const char* kPossibleNull = "Error: possible unintended null in string";
|
||||
@@ -140,14 +139,6 @@ nsCString::nsCString( const nsACString& aReadable ) {
|
||||
Assign(aReadable);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
void nsCString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
|
||||
if (aResult) {
|
||||
*aResult = sizeof(*this) + GetCapacity() * GetCharSize();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* This method truncates this string to given length.
|
||||
*
|
||||
@@ -1272,12 +1263,3 @@ nsCAutoString::nsCAutoString(const CBufDescriptor& aBuffer) : nsCString() {
|
||||
if(!aBuffer.mIsConst)
|
||||
AddNullTerminator(*this); //this isn't really needed, but it guarantees that folks don't pass string constants.
|
||||
}
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
void nsCAutoString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
|
||||
if (aResult) {
|
||||
*aResult = sizeof(*this) + GetCapacity() * GetCharSize();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -359,16 +359,6 @@ public:
|
||||
|
||||
PRBool EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
|
||||
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
/**
|
||||
* Retrieve the size of this string
|
||||
* @return string length
|
||||
*/
|
||||
virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
|
||||
#endif
|
||||
|
||||
private:
|
||||
// NOT TO BE IMPLEMENTED
|
||||
// these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion
|
||||
@@ -424,14 +414,6 @@ public:
|
||||
nsCAutoString& operator=( const char* aPtr ) { Assign(aPtr); return *this; }
|
||||
nsCAutoString& operator=( char aChar ) { Assign(aChar); return *this; }
|
||||
|
||||
#ifdef DEBUG
|
||||
/**
|
||||
* Retrieve the size of this string
|
||||
* @return string length
|
||||
*/
|
||||
virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
|
||||
#endif
|
||||
|
||||
char mBuffer[kDefaultStringSize];
|
||||
};
|
||||
|
||||
|
||||
@@ -51,7 +51,6 @@
|
||||
|
||||
#ifndef RICKG_TESTBED
|
||||
#include "prdtoa.h"
|
||||
#include "nsISizeOfHandler.h"
|
||||
#endif
|
||||
|
||||
static const char* kPossibleNull = "Error: possible unintended null in string";
|
||||
@@ -155,14 +154,6 @@ nsString::nsString( const nsAString& aReadable ) {
|
||||
Assign(aReadable);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
void nsString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
|
||||
if (aResult) {
|
||||
*aResult = sizeof(*this) + GetCapacity() * GetCharSize();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* This method truncates this string to given length.
|
||||
*
|
||||
@@ -1473,12 +1464,3 @@ nsAutoString::nsAutoString(PRUnichar aChar) : nsString(){
|
||||
AddNullTerminator(*this);
|
||||
Append(aChar);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
void nsAutoString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
|
||||
if (aResult) {
|
||||
*aResult = sizeof(*this) + GetCapacity() * GetCharSize();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -92,7 +92,6 @@ class UTF8traits
|
||||
class nsAFlatString { public: virtual ~nsAString() { } };
|
||||
#endif
|
||||
|
||||
class nsISizeOfHandler;
|
||||
class nsCString;
|
||||
|
||||
|
||||
@@ -433,14 +432,6 @@ public:
|
||||
*/
|
||||
static PRBool IsSpace(PRUnichar ch);
|
||||
|
||||
#ifdef DEBUG
|
||||
/**
|
||||
* Retrieve the size of this string
|
||||
* @return string length
|
||||
*/
|
||||
virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
|
||||
#endif
|
||||
|
||||
private:
|
||||
// NOT TO BE IMPLEMENTED
|
||||
// these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion
|
||||
@@ -498,14 +489,6 @@ public:
|
||||
nsAutoString& operator=( const PRUnichar* aPtr ) { Assign(aPtr); return *this; }
|
||||
nsAutoString& operator=( PRUnichar aChar ) { Assign(aChar); return *this; }
|
||||
|
||||
#ifdef DEBUG
|
||||
/**
|
||||
* Retrieve the size of this string
|
||||
* @return string length
|
||||
*/
|
||||
virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
|
||||
#endif
|
||||
|
||||
PRUnichar mBuffer[kDefaultStringSize];
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user