Backing out timeless's checkin. This wasn't supposed to happen until we branched
git-svn-id: svn://10.0.0.236/trunk@118508 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -100,9 +100,7 @@ class nsCParserNode : public nsIParserNode {
|
||||
#endif
|
||||
|
||||
public:
|
||||
static nsCParserNode* Create(CToken* aToken,
|
||||
nsTokenAllocator* aTokenAllocator,
|
||||
nsNodeAllocator* aNodeAllocator)
|
||||
static nsCParserNode* Create(CToken* aToken,PRInt32 aLineNumber,nsTokenAllocator* aTokenAllocator,nsNodeAllocator* aNodeAllocator)
|
||||
{
|
||||
#ifdef HEAP_ALLOCATED_NODES
|
||||
return new
|
||||
@@ -111,7 +109,7 @@ class nsCParserNode : public nsIParserNode {
|
||||
void* place = pool.Alloc(sizeof(nsCParserNode));
|
||||
return ::new (place)
|
||||
#endif
|
||||
nsCParserNode(aToken, aTokenAllocator, aNodeAllocator);
|
||||
nsCParserNode(aToken, aLineNumber, aTokenAllocator, aNodeAllocator);
|
||||
}
|
||||
|
||||
static void Destroy(nsCParserNode* aNode, nsFixedSizeAllocator& aPool)
|
||||
@@ -134,9 +132,7 @@ class nsCParserNode : public nsIParserNode {
|
||||
* @update gess5/11/98
|
||||
* @param aToken is the token this node "refers" to
|
||||
*/
|
||||
nsCParserNode(CToken* aToken,
|
||||
nsTokenAllocator* aTokenAllocator,
|
||||
nsNodeAllocator* aNodeAllocator=0);
|
||||
nsCParserNode(CToken* aToken,PRInt32 aLineNumber,nsTokenAllocator* aTokenAllocator,nsNodeAllocator* aNodeAllocator=0);
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
@@ -148,9 +144,7 @@ class nsCParserNode : public nsIParserNode {
|
||||
* Init
|
||||
* @update gess5/11/98
|
||||
*/
|
||||
virtual nsresult Init(CToken* aToken,
|
||||
nsTokenAllocator* aTokenAllocator,
|
||||
nsNodeAllocator* aNodeAllocator=0);
|
||||
virtual nsresult Init(CToken* aToken,PRInt32 aLineNumber,nsTokenAllocator* aTokenAllocator,nsNodeAllocator* aNodeAllocator=0);
|
||||
|
||||
/**
|
||||
* Retrieve the name of the node
|
||||
@@ -166,6 +160,20 @@ class nsCParserNode : public nsIParserNode {
|
||||
*/
|
||||
virtual const nsAString& GetText() const;
|
||||
|
||||
/**
|
||||
* Retrieve skipped context from node
|
||||
* @update gess5/11/98
|
||||
* @return string containing skipped content
|
||||
*/
|
||||
virtual const nsString& GetSkippedContent() const;
|
||||
|
||||
/**
|
||||
* Retrieve skipped context from node
|
||||
* @update gess5/11/98
|
||||
* @return string containing skipped content
|
||||
*/
|
||||
virtual void SetSkippedContent(nsString& aString);
|
||||
|
||||
/**
|
||||
* Retrieve the type of the parser node.
|
||||
* @update gess5/11/98
|
||||
@@ -268,8 +276,10 @@ class nsCParserNode : public nsIParserNode {
|
||||
*/
|
||||
virtual nsresult ReleaseAll();
|
||||
|
||||
PRInt32 mLineNumber;
|
||||
CToken* mToken;
|
||||
nsDeque* mAttributes;
|
||||
nsString* mSkippedContent;
|
||||
PRInt32 mUseCount;
|
||||
PRBool mGenericState;
|
||||
nsCOMPtr<nsIAtom> mIDAttributeAtom;
|
||||
|
||||
Reference in New Issue
Block a user