wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Count CTOR/DTOR in HTML5 parser; remove debug NS_WARNINGS

Browse Source
This commit is contained in:
Henri Sivonen 2009-02-12 10:30:41 +02:00
parent c26597853c
commit 3cb0e1a7ca
21 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/html/parser/src/nsHtml5AttributeName.cpp
View File

@ -33,6 +33,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -135,6 +136,7 @@ nsHtml5AttributeName::nsHtml5AttributeName(PRInt32* uri, nsIAtom** local, nsIAto
local(local),
prefix(prefix)
{
MOZ_COUNT_CTOR(nsHtml5AttributeName);
}
nsHtml5AttributeName*
@ -151,6 +153,7 @@ nsHtml5AttributeName::release()
nsHtml5AttributeName::~nsHtml5AttributeName()
{
MOZ_COUNT_DTOR(nsHtml5AttributeName);
nsHtml5Portability::releaseLocal(local[0]);
delete[] local;
}

1
content/html/parser/src/nsHtml5AttributeName.h
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

4
content/html/parser/src/nsHtml5ElementName.cpp
View File

@ -33,6 +33,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -95,6 +96,7 @@ nsHtml5ElementName::nsHtml5ElementName(nsIAtom* name, nsIAtom* camelCaseName, PR
scoping(scoping),
fosterParenting(fosterParenting)
{
MOZ_COUNT_CTOR(nsHtml5ElementName);
}
@ -106,6 +108,7 @@ nsHtml5ElementName::nsHtml5ElementName(nsIAtom* name)
scoping(PR_FALSE),
fosterParenting(PR_FALSE)
{
MOZ_COUNT_CTOR(nsHtml5ElementName);
}
void
@ -116,6 +119,7 @@ nsHtml5ElementName::release()
nsHtml5ElementName::~nsHtml5ElementName()
{
MOZ_COUNT_DTOR(nsHtml5ElementName);
nsHtml5Portability::releaseLocal(name);
}

1
content/html/parser/src/nsHtml5ElementName.h
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

3
content/html/parser/src/nsHtml5HtmlAttributes.cpp
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -61,11 +62,13 @@ nsHtml5HtmlAttributes::nsHtml5HtmlAttributes(PRInt32 mode)
names(jArray<nsHtml5AttributeName*,PRInt32>(5)),
values(jArray<nsString*,PRInt32>(5))
{
MOZ_COUNT_CTOR(nsHtml5HtmlAttributes);
}
nsHtml5HtmlAttributes::~nsHtml5HtmlAttributes()
{
MOZ_COUNT_DTOR(nsHtml5HtmlAttributes);
clear(0);
names.release();
values.release();

1
content/html/parser/src/nsHtml5HtmlAttributes.h
View File

@ -35,6 +35,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

1
content/html/parser/src/nsHtml5MetaScanner.cpp
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

1
content/html/parser/src/nsHtml5MetaScanner.h
View File

@ -35,6 +35,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

3
content/html/parser/src/nsHtml5MetaScannerCppSupplement.h
View File

@ -39,6 +39,7 @@
#include "nsServiceManagerUtils.h"
#include "nsICharsetAlias.h"
#include "nsEncoderDecoderUtils.h"
#include "nsTraceRefcnt.h"
static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID);
@ -51,10 +52,12 @@ nsHtml5MetaScanner::nsHtml5MetaScanner()
strBufLen(0),
strBuf(jArray<PRUnichar,PRInt32>(36))
{
MOZ_COUNT_CTOR(nsHtml5MetaScanner);
}
nsHtml5MetaScanner::~nsHtml5MetaScanner()
{
MOZ_COUNT_DTOR(nsHtml5MetaScanner);
strBuf.release();
}

3
content/html/parser/src/nsHtml5Parser.cpp
View File

@ -578,10 +578,8 @@ ParserWriteFunc(nsIInputStream* aInStream,
{
nsHtml5Parser* parser = static_cast<nsHtml5Parser*> (aHtml5Parser);
if (parser->HasDecoder()) {
NS_WARNING("not siffing\n");
return parser->WriteStreamBytes((const PRUint8*)aFromSegment, aCount, aWriteCount);
} else {
NS_WARNING("sniffing");
return parser->SniffStreamBytes((const PRUint8*)aFromSegment, aCount, aWriteCount);
}
}
@ -593,7 +591,6 @@ nsHtml5Parser::OnDataAvailable(nsIRequest* aRequest,
PRUint32 aSourceOffset,
PRUint32 aLength)
{
NS_WARNING("OnDataAvailable FFFF\n");
NS_PRECONDITION((eOnStart == mStreamListenerState ||
eOnDataAvail == mStreamListenerState),
"Error: OnStartRequest() must be called before OnDataAvailable()");

1
content/html/parser/src/nsHtml5Portability.h
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

6
content/html/parser/src/nsHtml5StackNode.cpp
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -66,6 +67,7 @@ nsHtml5StackNode::nsHtml5StackNode(PRInt32 group, PRInt32 ns, nsIAtom* name, nsI
fosterParenting(fosterParenting),
tainted(PR_FALSE)
{
MOZ_COUNT_CTOR(nsHtml5StackNode);
nsHtml5Portability::retainLocal(name);
nsHtml5Portability::retainLocal(popName);
nsHtml5Portability::retainElement(node);
@ -83,6 +85,7 @@ nsHtml5StackNode::nsHtml5StackNode(PRInt32 ns, nsHtml5ElementName* elementName,
fosterParenting(elementName->fosterParenting),
tainted(PR_FALSE)
{
MOZ_COUNT_CTOR(nsHtml5StackNode);
nsHtml5Portability::retainLocal(name);
nsHtml5Portability::retainLocal(popName);
nsHtml5Portability::retainElement(node);
@ -100,6 +103,7 @@ nsHtml5StackNode::nsHtml5StackNode(PRInt32 ns, nsHtml5ElementName* elementName,
fosterParenting(elementName->fosterParenting),
tainted(PR_FALSE)
{
MOZ_COUNT_CTOR(nsHtml5StackNode);
nsHtml5Portability::retainLocal(name);
nsHtml5Portability::retainLocal(popName);
nsHtml5Portability::retainElement(node);
@ -117,6 +121,7 @@ nsHtml5StackNode::nsHtml5StackNode(PRInt32 ns, nsHtml5ElementName* elementName,
fosterParenting(PR_FALSE),
tainted(PR_FALSE)
{
MOZ_COUNT_CTOR(nsHtml5StackNode);
nsHtml5Portability::retainLocal(name);
nsHtml5Portability::retainLocal(popName);
nsHtml5Portability::retainElement(node);
@ -125,6 +130,7 @@ nsHtml5StackNode::nsHtml5StackNode(PRInt32 ns, nsHtml5ElementName* elementName,
nsHtml5StackNode::~nsHtml5StackNode()
{
MOZ_COUNT_DTOR(nsHtml5StackNode);
nsHtml5Portability::releaseLocal(name);
nsHtml5Portability::releaseLocal(popName);
nsHtml5Portability::releaseElement(node);

1
content/html/parser/src/nsHtml5StackNode.h
View File

@ -35,6 +35,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

6
content/html/parser/src/nsHtml5Tokenizer.cpp
View File

@ -36,6 +36,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -63,6 +64,7 @@ nsHtml5Tokenizer::nsHtml5Tokenizer(nsHtml5TreeBuilder* tokenHandler, nsHtml5Pars
bmpChar(jArray<PRUnichar,PRInt32>(1)),
astralChar(jArray<PRUnichar,PRInt32>(2))
{
MOZ_COUNT_CTOR(nsHtml5Tokenizer);
}
void
@ -75,6 +77,7 @@ nsHtml5Tokenizer::initLocation(nsString* newPublicId, nsString* newSystemId)
nsHtml5Tokenizer::~nsHtml5Tokenizer()
{
MOZ_COUNT_DTOR(nsHtml5Tokenizer);
bmpChar.release();
astralChar.release();
}
@ -2520,6 +2523,9 @@ nsHtml5Tokenizer::handleNcrValue(PRInt32 returnState)
emitOrAppendOne(nsHtml5Tokenizer::REPLACEMENT_CHARACTER, returnState);
} else if (isNonCharacter(value)) {
emitOrAppendOne(nsHtml5Tokenizer::REPLACEMENT_CHARACTER, returnState);
} else if (value >= 0xFDD0 && value <= 0xFDEF) {
emitOrAppendOne(nsHtml5Tokenizer::REPLACEMENT_CHARACTER, returnState);
} else if (value <= 0xFFFF) {
PRUnichar ch = (PRUnichar) value;

1
content/html/parser/src/nsHtml5Tokenizer.h
View File

@ -37,6 +37,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

5
content/html/parser/src/nsHtml5TreeBuilder.cpp
View File

@ -36,6 +36,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -519,6 +520,10 @@ nsHtml5TreeBuilder::eof()
void
nsHtml5TreeBuilder::endTokenization()
{
nsHtml5Portability::releaseElement(formPointer);
formPointer = nsnull;
nsHtml5Portability::releaseElement(headPointer);
headPointer = nsnull;
while (currentPtr > -1) {
stack[currentPtr]->release();
currentPtr--;

1
content/html/parser/src/nsHtml5TreeBuilder.h
View File

@ -37,6 +37,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

3
content/html/parser/src/nsHtml5TreeBuilderCppSupplement.h
View File

@ -51,6 +51,7 @@
#include "nsIFormControl.h"
#include "nsNodeUtils.h"
#include "nsIStyleSheetLinkingElement.h"
#include "nsTraceRefcnt.h"
// this really should be autogenerated...
jArray<PRUnichar,PRInt32> nsHtml5TreeBuilder::ISINDEX_PROMPT = jArray<PRUnichar,PRInt32>();
@ -63,10 +64,12 @@ nsHtml5TreeBuilder::nsHtml5TreeBuilder(nsHtml5Parser* aParser)
formPointer(nsnull),
headPointer(nsnull)
{
MOZ_COUNT_CTOR(nsHtml5TreeBuilder);
}
nsHtml5TreeBuilder::~nsHtml5TreeBuilder()
{
MOZ_COUNT_DTOR(nsHtml5TreeBuilder);
delete MARKER;
}

2
content/html/parser/src/nsHtml5UTF16Buffer.cpp
View File

@ -33,6 +33,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
@ -59,6 +60,7 @@ nsHtml5UTF16Buffer::nsHtml5UTF16Buffer(PRUnichar* buffer, PRInt32 start, PRInt32
start(start),
end(end)
{
MOZ_COUNT_CTOR(nsHtml5UTF16Buffer);
}
PRInt32

1
content/html/parser/src/nsHtml5UTF16Buffer.h
View File

@ -34,6 +34,7 @@
#include "nsINameSpaceManager.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsTraceRefcnt.h"
#include "jArray.h"
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"

5
content/html/parser/src/nsHtml5UTF16BufferCppSupplement.h
View File

@ -35,6 +35,8 @@
*
* ***** END LICENSE BLOCK ***** */
#include "nsTraceRefcnt.h"
nsHtml5UTF16Buffer::nsHtml5UTF16Buffer(PRInt32 size)
: buffer(new PRUnichar[size]),
start(0),
@ -42,6 +44,7 @@ nsHtml5UTF16Buffer::nsHtml5UTF16Buffer(PRInt32 size)
next(nsnull),
key(nsnull)
{
MOZ_COUNT_CTOR(nsHtml5UTF16Buffer);
}
nsHtml5UTF16Buffer::nsHtml5UTF16Buffer(void* key)
@ -51,9 +54,11 @@ nsHtml5UTF16Buffer::nsHtml5UTF16Buffer(void* key)
next(nsnull),
key(key)
{
MOZ_COUNT_CTOR(nsHtml5UTF16Buffer);
}
nsHtml5UTF16Buffer::~nsHtml5UTF16Buffer()
{
MOZ_COUNT_DTOR(nsHtml5UTF16Buffer);
delete[] buffer;
}