corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg

Browse Source 
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
This commit is contained in:
Ehsan Akhgari
2012-08-22 11:56:38 -04:00
parent 267ef7575d
commit 243c878d26
4098 changed files with 54923 additions and 54923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
parser/html/nsHtml5TreeBuilder.cpp
View File

@@ -67,13 +67,13 @@
PRUnichar nsHtml5TreeBuilder::REPLACEMENT_CHARACTER[] = { 0xfffd };
static const char* const QUIRKY_PUBLIC_IDS_DATA[] = { "+//silmaril//dtd html pro v0r11 19970101//", "-//advasoft ltd//dtd html 3.0 aswedit + extensions//", "-//as//dtd html 3.0 aswedit + extensions//", "-//ietf//dtd html 2.0 level 1//", "-//ietf//dtd html 2.0 level 2//", "-//ietf//dtd html 2.0 strict level 1//", "-//ietf//dtd html 2.0 strict level 2//", "-//ietf//dtd html 2.0 strict//", "-//ietf//dtd html 2.0//", "-//ietf//dtd html 2.1e//", "-//ietf//dtd html 3.0//", "-//ietf//dtd html 3.2 final//", "-//ietf//dtd html 3.2//", "-//ietf//dtd html 3//", "-//ietf//dtd html level 0//", "-//ietf//dtd html level 1//", "-//ietf//dtd html level 2//", "-//ietf//dtd html level 3//", "-//ietf//dtd html strict level 0//", "-//ietf//dtd html strict level 1//", "-//ietf//dtd html strict level 2//", "-//ietf//dtd html strict level 3//", "-//ietf//dtd html strict//", "-//ietf//dtd html//", "-//metrius//dtd metrius presentational//", "-//microsoft//dtd internet explorer 2.0 html strict//", "-//microsoft//dtd internet explorer 2.0 html//", "-//microsoft//dtd internet explorer 2.0 tables//", "-//microsoft//dtd internet explorer 3.0 html strict//", "-//microsoft//dtd internet explorer 3.0 html//", "-//microsoft//dtd internet explorer 3.0 tables//", "-//netscape comm. corp.//dtd html//", "-//netscape comm. corp.//dtd strict html//", "-//o'reilly and associates//dtd html 2.0//", "-//o'reilly and associates//dtd html extended 1.0//", "-//o'reilly and associates//dtd html extended relaxed 1.0//", "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//", "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//", "-//spyglass//dtd html 2.0 extended//", "-//sq//dtd html 2.0 hotmetal + extensions//", "-//sun microsystems corp.//dtd hotjava html//", "-//sun microsystems corp.//dtd hotjava strict html//", "-//w3c//dtd html 3 1995-03-24//", "-//w3c//dtd html 3.2 draft//", "-//w3c//dtd html 3.2 final//", "-//w3c//dtd html 3.2//", "-//w3c//dtd html 3.2s draft//", "-//w3c//dtd html 4.0 frameset//", "-//w3c//dtd html 4.0 transitional//", "-//w3c//dtd html experimental 19960712//", "-//w3c//dtd html experimental 970421//", "-//w3c//dtd w3 html//", "-//w3o//dtd w3 html 3.0//", "-//webtechs//dtd mozilla html 2.0//", "-//webtechs//dtd mozilla html//" };
staticJArray<const char*,PRInt32> nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS = { QUIRKY_PUBLIC_IDS_DATA, NS_ARRAY_LENGTH(QUIRKY_PUBLIC_IDS_DATA) };
staticJArray<const char*,int32_t> nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS = { QUIRKY_PUBLIC_IDS_DATA, NS_ARRAY_LENGTH(QUIRKY_PUBLIC_IDS_DATA) };
void
nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self)
{
tokenizer = self;
stack = jArray<nsHtml5StackNode*,PRInt32>::newJArray(64);
listOfActiveFormattingElements = jArray<nsHtml5StackNode*,PRInt32>::newJArray(64);
stack = jArray<nsHtml5StackNode*,int32_t>::newJArray(64);
listOfActiveFormattingElements = jArray<nsHtml5StackNode*,int32_t>::newJArray(64);
needToDropLF = false;
originalMode = NS_HTML5TREE_BUILDER_INITIAL;
currentPtr = -1;
@@ -83,7 +83,7 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self)
deepTreeSurrogateParent = nullptr;
start(fragment);
charBufferLen = 0;
charBuffer = jArray<PRUnichar,PRInt32>::newJArray(1024);
charBuffer = jArray<PRUnichar,int32_t>::newJArray(1024);
framesetOk = true;
if (fragment) {
nsIContent** elt;
@@ -152,7 +152,7 @@ nsHtml5TreeBuilder::doctype(nsIAtom* name, nsString* publicIdentifier, nsString*
}
void
nsHtml5TreeBuilder::comment(PRUnichar* buf, PRInt32 start, PRInt32 length)
nsHtml5TreeBuilder::comment(PRUnichar* buf, int32_t start, int32_t length)
{
needToDropLF = false;
if (!isInForeign()) {
@@ -180,7 +180,7 @@ nsHtml5TreeBuilder::comment(PRUnichar* buf, PRInt32 start, PRInt32 length)
}
void
nsHtml5TreeBuilder::characters(const PRUnichar* buf, PRInt32 start, PRInt32 length)
nsHtml5TreeBuilder::characters(const PRUnichar* buf, int32_t start, int32_t length)
{
if (tokenizer->isViewingXmlSource()) {
return;
@@ -214,8 +214,8 @@ nsHtml5TreeBuilder::characters(const PRUnichar* buf, PRInt32 start, PRInt32 leng
return;
}
default: {
PRInt32 end = start + length;
for (PRInt32 i = start; i < end; i++) {
int32_t end = start + length;
for (int32_t i = start; i < end; i++) {
switch(buf[i]) {
case ' ':
case '\t':
@@ -567,14 +567,14 @@ void
nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttributes* attributes, bool selfClosing)
{
flushCharacters();
PRInt32 eltPos;
int32_t eltPos;
needToDropLF = false;
starttagloop: for (; ; ) {
PRInt32 group = elementName->getGroup();
int32_t group = elementName->getGroup();
nsIAtom* name = elementName->name;
if (isInForeign()) {
nsHtml5StackNode* currentNode = stack[currentPtr];
PRInt32 currNs = currentNode->ns;
int32_t currNs = currentNode->ns;
if (!(currentNode->isHtmlIntegrationPoint() || (currNs == kNameSpaceID_MathML && ((currentNode->getGroup() == NS_HTML5TREE_BUILDER_MI_MO_MN_MS_MTEXT && group != NS_HTML5TREE_BUILDER_MGLYPH_OR_MALIGNMARK) || (currentNode->getGroup() == NS_HTML5TREE_BUILDER_ANNOTATION_XML && group == NS_HTML5TREE_BUILDER_SVG))))) {
switch(group) {
case NS_HTML5TREE_BUILDER_B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U:
@@ -1010,7 +1010,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
NS_HTML5_BREAK(starttagloop);
}
case NS_HTML5TREE_BUILDER_A: {
PRInt32 activeAPos = findInListOfActiveFormattingElementsContainsBetweenEndAndLastMarker(nsHtml5Atoms::a);
int32_t activeAPos = findInListOfActiveFormattingElementsContainsBetweenEndAndLastMarker(nsHtml5Atoms::a);
if (activeAPos != -1) {
errFooSeenWhenFooOpen(name);
nsHtml5StackNode* activeA = listOfActiveFormattingElements[activeAPos];
@@ -1130,23 +1130,23 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
}
implicitlyCloseP();
nsHtml5HtmlAttributes* formAttrs = new nsHtml5HtmlAttributes(0);
PRInt32 actionIndex = attributes->getIndex(nsHtml5AttributeName::ATTR_ACTION);
int32_t actionIndex = attributes->getIndex(nsHtml5AttributeName::ATTR_ACTION);
if (actionIndex > -1) {
formAttrs->addAttribute(nsHtml5AttributeName::ATTR_ACTION, attributes->getValue(actionIndex));
}
appendToCurrentNodeAndPushFormElementMayFoster(formAttrs);
appendVoidElementToCurrentMayFoster(nsHtml5ElementName::ELT_HR, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
appendToCurrentNodeAndPushElementMayFoster(nsHtml5ElementName::ELT_LABEL, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
PRInt32 promptIndex = attributes->getIndex(nsHtml5AttributeName::ATTR_PROMPT);
int32_t promptIndex = attributes->getIndex(nsHtml5AttributeName::ATTR_PROMPT);
if (promptIndex > -1) {
autoJArray<PRUnichar,PRInt32> prompt = nsHtml5Portability::newCharArrayFromString(attributes->getValue(promptIndex));
autoJArray<PRUnichar,int32_t> prompt = nsHtml5Portability::newCharArrayFromString(attributes->getValue(promptIndex));
appendCharacters(stack[currentPtr]->node, prompt, 0, prompt.length);
} else {
appendIsindexPrompt(stack[currentPtr]->node);
}
nsHtml5HtmlAttributes* inputAttributes = new nsHtml5HtmlAttributes(0);
inputAttributes->addAttribute(nsHtml5AttributeName::ATTR_NAME, nsHtml5Portability::newStringFromLiteral("isindex"));
for (PRInt32 i = 0; i < attributes->getLength(); i++) {
for (int32_t i = 0; i < attributes->getLength(); i++) {
nsHtml5AttributeName* attributeQName = attributes->getAttributeName(i);
if (nsHtml5AttributeName::ATTR_NAME == attributeQName || nsHtml5AttributeName::ATTR_PROMPT == attributeQName) {
attributes->releaseValue(i);
@@ -1807,18 +1807,18 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
bool
nsHtml5TreeBuilder::isSpecialParentInForeign(nsHtml5StackNode* stackNode)
{
PRInt32 ns = stackNode->ns;
int32_t ns = stackNode->ns;
return (kNameSpaceID_XHTML == ns) || (stackNode->isHtmlIntegrationPoint()) || ((kNameSpaceID_MathML == ns) && (stackNode->getGroup() == NS_HTML5TREE_BUILDER_MI_MO_MN_MS_MTEXT));
}
nsString*
nsHtml5TreeBuilder::extractCharsetFromContent(nsString* attributeValue)
{
PRInt32 charsetState = NS_HTML5TREE_BUILDER_CHARSET_INITIAL;
PRInt32 start = -1;
PRInt32 end = -1;
autoJArray<PRUnichar,PRInt32> buffer = nsHtml5Portability::newCharArrayFromString(attributeValue);
for (PRInt32 i = 0; i < buffer.length; i++) {
int32_t charsetState = NS_HTML5TREE_BUILDER_CHARSET_INITIAL;
int32_t start = -1;
int32_t end = -1;
autoJArray<PRUnichar,int32_t> buffer = nsHtml5Portability::newCharArrayFromString(attributeValue);
for (int32_t i = 0; i < buffer.length; i++) {
PRUnichar c = buffer[i];
switch(charsetState) {
case NS_HTML5TREE_BUILDER_CHARSET_INITIAL: {
@@ -2037,8 +2037,8 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
{
flushCharacters();
needToDropLF = false;
PRInt32 eltPos;
PRInt32 group = elementName->getGroup();
int32_t eltPos;
int32_t group = elementName->getGroup();
nsIAtom* name = elementName->name;
for (; ; ) {
if (isInForeign()) {
@@ -2285,7 +2285,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
if (NS_UNLIKELY(mViewSource)) {
for (PRInt32 i = 2; i <= currentPtr; i++) {
for (int32_t i = 2; i <= currentPtr; i++) {
switch(stack[i]->getGroup()) {
case NS_HTML5TREE_BUILDER_DD_OR_DT:
case NS_HTML5TREE_BUILDER_LI:
@@ -2315,7 +2315,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
NS_HTML5_BREAK(endtagloop);
}
if (NS_UNLIKELY(mViewSource)) {
for (PRInt32 i = 0; i <= currentPtr; i++) {
for (int32_t i = 0; i <= currentPtr; i++) {
switch(stack[i]->getGroup()) {
case NS_HTML5TREE_BUILDER_DD_OR_DT:
case NS_HTML5TREE_BUILDER_LI:
@@ -2794,10 +2794,10 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
endtagloop_end: ;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInTableScopeOrRootTbodyTheadTfoot()
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->getGroup() == NS_HTML5TREE_BUILDER_TBODY_OR_THEAD_OR_TFOOT) {
return i;
}
@@ -2805,10 +2805,10 @@ nsHtml5TreeBuilder::findLastInTableScopeOrRootTbodyTheadTfoot()
return 0;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLast(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
}
@@ -2816,10 +2816,10 @@ nsHtml5TreeBuilder::findLast(nsIAtom* name)
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInTableScope(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
} else if (stack[i]->name == nsHtml5Atoms::table) {
@@ -2829,10 +2829,10 @@ nsHtml5TreeBuilder::findLastInTableScope(nsIAtom* name)
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInButtonScope(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
} else if (stack[i]->isScoping() || stack[i]->name == nsHtml5Atoms::button) {
@@ -2842,10 +2842,10 @@ nsHtml5TreeBuilder::findLastInButtonScope(nsIAtom* name)
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInScope(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
} else if (stack[i]->isScoping()) {
@@ -2855,10 +2855,10 @@ nsHtml5TreeBuilder::findLastInScope(nsIAtom* name)
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInListScope(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
} else if (stack[i]->isScoping() || stack[i]->name == nsHtml5Atoms::ul || stack[i]->name == nsHtml5Atoms::ol) {
@@ -2868,10 +2868,10 @@ nsHtml5TreeBuilder::findLastInListScope(nsIAtom* name)
return NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInScopeHn()
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->getGroup() == NS_HTML5TREE_BUILDER_H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6) {
return i;
} else if (stack[i]->isScoping()) {
@@ -2972,7 +2972,7 @@ nsHtml5TreeBuilder::isQuirky(nsIAtom* name, nsString* publicIdentifier, nsString
return true;
}
if (publicIdentifier) {
for (PRInt32 i = 0; i < nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS.length; i++) {
for (int32_t i = 0; i < nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS.length; i++) {
if (nsHtml5Portability::lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS[i], publicIdentifier)) {
return true;
}
@@ -2994,7 +2994,7 @@ nsHtml5TreeBuilder::isQuirky(nsIAtom* name, nsString* publicIdentifier, nsString
}
void
nsHtml5TreeBuilder::closeTheCell(PRInt32 eltPos)
nsHtml5TreeBuilder::closeTheCell(int32_t eltPos)
{
generateImpliedEndTags();
if (!!NS_UNLIKELY(mViewSource) && eltPos != currentPtr) {
@@ -3008,10 +3008,10 @@ nsHtml5TreeBuilder::closeTheCell(PRInt32 eltPos)
return;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastInTableScopeTdTh()
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
nsIAtom* name = stack[i]->name;
if (nsHtml5Atoms::td == name || nsHtml5Atoms::th == name) {
return i;
@@ -3023,7 +3023,7 @@ nsHtml5TreeBuilder::findLastInTableScopeTdTh()
}
void
nsHtml5TreeBuilder::clearStackBackTo(PRInt32 eltPos)
nsHtml5TreeBuilder::clearStackBackTo(int32_t eltPos)
{
while (currentPtr > eltPos) {
pop();
@@ -3035,8 +3035,8 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
{
nsHtml5StackNode* node;
nsIAtom* name;
PRInt32 ns;
for (PRInt32 i = currentPtr; i >= 0; i--) {
int32_t ns;
for (int32_t i = currentPtr; i >= 0; i--) {
node = stack[i];
name = node->name;
ns = node->ns;
@@ -3099,7 +3099,7 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
void
nsHtml5TreeBuilder::implicitlyCloseP()
{
PRInt32 eltPos = findLastInButtonScope(nsHtml5Atoms::p);
int32_t eltPos = findLastInButtonScope(nsHtml5Atoms::p);
if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
return;
}
@@ -3131,7 +3131,7 @@ nsHtml5TreeBuilder::push(nsHtml5StackNode* node)
{
currentPtr++;
if (currentPtr == stack.length) {
jArray<nsHtml5StackNode*,PRInt32> newStack = jArray<nsHtml5StackNode*,PRInt32>::newJArray(stack.length + 64);
jArray<nsHtml5StackNode*,int32_t> newStack = jArray<nsHtml5StackNode*,int32_t>::newJArray(stack.length + 64);
nsHtml5ArrayCopy::arraycopy(stack, newStack, stack.length);
stack = newStack;
}
@@ -3144,7 +3144,7 @@ nsHtml5TreeBuilder::silentPush(nsHtml5StackNode* node)
{
currentPtr++;
if (currentPtr == stack.length) {
jArray<nsHtml5StackNode*,PRInt32> newStack = jArray<nsHtml5StackNode*,PRInt32>::newJArray(stack.length + 64);
jArray<nsHtml5StackNode*,int32_t> newStack = jArray<nsHtml5StackNode*,int32_t>::newJArray(stack.length + 64);
nsHtml5ArrayCopy::arraycopy(stack, newStack, stack.length);
stack = newStack;
}
@@ -3156,7 +3156,7 @@ nsHtml5TreeBuilder::append(nsHtml5StackNode* node)
{
listPtr++;
if (listPtr == listOfActiveFormattingElements.length) {
jArray<nsHtml5StackNode*,PRInt32> newList = jArray<nsHtml5StackNode*,PRInt32>::newJArray(listOfActiveFormattingElements.length + 64);
jArray<nsHtml5StackNode*,int32_t> newList = jArray<nsHtml5StackNode*,int32_t>::newJArray(listOfActiveFormattingElements.length + 64);
nsHtml5ArrayCopy::arraycopy(listOfActiveFormattingElements, newList, listOfActiveFormattingElements.length);
listOfActiveFormattingElements = newList;
}
@@ -3177,7 +3177,7 @@ nsHtml5TreeBuilder::clearTheListOfActiveFormattingElementsUpToTheLastMarker()
}
void
nsHtml5TreeBuilder::removeFromStack(PRInt32 pos)
nsHtml5TreeBuilder::removeFromStack(int32_t pos)
{
if (currentPtr == pos) {
pop();
@@ -3196,7 +3196,7 @@ nsHtml5TreeBuilder::removeFromStack(nsHtml5StackNode* node)
if (stack[currentPtr] == node) {
pop();
} else {
PRInt32 pos = currentPtr - 1;
int32_t pos = currentPtr - 1;
while (pos >= 0 && stack[pos] != node) {
pos--;
}
@@ -3211,7 +3211,7 @@ nsHtml5TreeBuilder::removeFromStack(nsHtml5StackNode* node)
}
void
nsHtml5TreeBuilder::removeFromListOfActiveFormattingElements(PRInt32 pos)
nsHtml5TreeBuilder::removeFromListOfActiveFormattingElements(int32_t pos)
{
listOfActiveFormattingElements[pos]->release();
@@ -3229,8 +3229,8 @@ nsHtml5TreeBuilder::removeFromListOfActiveFormattingElements(PRInt32 pos)
bool
nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
{
for (PRInt32 i = 0; i < 8; ++i) {
PRInt32 formattingEltListPos = listPtr;
for (int32_t i = 0; i < 8; ++i) {
int32_t formattingEltListPos = listPtr;
while (formattingEltListPos > -1) {
nsHtml5StackNode* listNode = listOfActiveFormattingElements[formattingEltListPos];
if (!listNode) {
@@ -3245,7 +3245,7 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
return false;
}
nsHtml5StackNode* formattingElt = listOfActiveFormattingElements[formattingEltListPos];
PRInt32 formattingEltStackPos = currentPtr;
int32_t formattingEltStackPos = currentPtr;
bool inScope = true;
while (formattingEltStackPos > -1) {
nsHtml5StackNode* node = stack[formattingEltStackPos];
@@ -3268,7 +3268,7 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
if (formattingEltStackPos != currentPtr) {
errEndTagViolatesNestingRules(name);
}
PRInt32 furthestBlockPos = formattingEltStackPos + 1;
int32_t furthestBlockPos = formattingEltStackPos + 1;
while (furthestBlockPos <= currentPtr) {
nsHtml5StackNode* node = stack[furthestBlockPos];
if (node->isSpecial()) {
@@ -3285,13 +3285,13 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
}
nsHtml5StackNode* commonAncestor = stack[formattingEltStackPos - 1];
nsHtml5StackNode* furthestBlock = stack[furthestBlockPos];
PRInt32 bookmark = formattingEltListPos;
PRInt32 nodePos = furthestBlockPos;
int32_t bookmark = formattingEltListPos;
int32_t nodePos = furthestBlockPos;
nsHtml5StackNode* lastNode = furthestBlock;
for (PRInt32 j = 0; j < 3; ++j) {
for (int32_t j = 0; j < 3; ++j) {
nodePos--;
nsHtml5StackNode* node = stack[nodePos];
PRInt32 nodeListPos = findInListOfActiveFormattingElements(node);
int32_t nodeListPos = findInListOfActiveFormattingElements(node);
if (nodeListPos == -1) {
@@ -3344,7 +3344,7 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
}
void
nsHtml5TreeBuilder::insertIntoStack(nsHtml5StackNode* node, PRInt32 position)
nsHtml5TreeBuilder::insertIntoStack(nsHtml5StackNode* node, int32_t position)
{
@@ -3358,7 +3358,7 @@ nsHtml5TreeBuilder::insertIntoStack(nsHtml5StackNode* node, PRInt32 position)
}
void
nsHtml5TreeBuilder::insertIntoListOfActiveFormattingElements(nsHtml5StackNode* formattingClone, PRInt32 bookmark)
nsHtml5TreeBuilder::insertIntoListOfActiveFormattingElements(nsHtml5StackNode* formattingClone, int32_t bookmark)
{
formattingClone->retain();
@@ -3369,10 +3369,10 @@ nsHtml5TreeBuilder::insertIntoListOfActiveFormattingElements(nsHtml5StackNode* f
listOfActiveFormattingElements[bookmark] = formattingClone;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findInListOfActiveFormattingElements(nsHtml5StackNode* node)
{
for (PRInt32 i = listPtr; i >= 0; i--) {
for (int32_t i = listPtr; i >= 0; i--) {
if (node == listOfActiveFormattingElements[i]) {
return i;
}
@@ -3380,10 +3380,10 @@ nsHtml5TreeBuilder::findInListOfActiveFormattingElements(nsHtml5StackNode* node)
return -1;
}
PRInt32
int32_t
nsHtml5TreeBuilder::findInListOfActiveFormattingElementsContainsBetweenEndAndLastMarker(nsIAtom* name)
{
for (PRInt32 i = listPtr; i >= 0; i--) {
for (int32_t i = listPtr; i >= 0; i--) {
nsHtml5StackNode* node = listOfActiveFormattingElements[i];
if (!node) {
return -1;
@@ -3397,9 +3397,9 @@ nsHtml5TreeBuilder::findInListOfActiveFormattingElementsContainsBetweenEndAndLas
void
nsHtml5TreeBuilder::maybeForgetEarlierDuplicateFormattingElement(nsIAtom* name, nsHtml5HtmlAttributes* attributes)
{
PRInt32 candidate = -1;
PRInt32 count = 0;
for (PRInt32 i = listPtr; i >= 0; i--) {
int32_t candidate = -1;
int32_t count = 0;
for (int32_t i = listPtr; i >= 0; i--) {
nsHtml5StackNode* node = listOfActiveFormattingElements[i];
if (!node) {
break;
@@ -3414,10 +3414,10 @@ nsHtml5TreeBuilder::maybeForgetEarlierDuplicateFormattingElement(nsIAtom* name,
}
}
PRInt32
int32_t
nsHtml5TreeBuilder::findLastOrRoot(nsIAtom* name)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->name == name) {
return i;
}
@@ -3425,10 +3425,10 @@ nsHtml5TreeBuilder::findLastOrRoot(nsIAtom* name)
return 0;
}
PRInt32
nsHtml5TreeBuilder::findLastOrRoot(PRInt32 group)
int32_t
nsHtml5TreeBuilder::findLastOrRoot(int32_t group)
{
for (PRInt32 i = currentPtr; i > 0; i--) {
for (int32_t i = currentPtr; i > 0; i--) {
if (stack[i]->getGroup() == group) {
return i;
}
@@ -3475,7 +3475,7 @@ nsHtml5TreeBuilder::reconstructTheActiveFormattingElements()
if (!mostRecent || isInStack(mostRecent)) {
return;
}
PRInt32 entryPos = listPtr;
int32_t entryPos = listPtr;
for (; ; ) {
entryPos--;
if (entryPos == -1) {
@@ -3510,7 +3510,7 @@ nsHtml5TreeBuilder::reconstructTheActiveFormattingElements()
void
nsHtml5TreeBuilder::insertIntoFosterParent(nsIContent** child)
{
PRInt32 eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TABLE);
int32_t eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TABLE);
nsHtml5StackNode* node = stack[eltPos];
nsIContent** elt = node->node;
if (!eltPos) {
@@ -3523,7 +3523,7 @@ nsHtml5TreeBuilder::insertIntoFosterParent(nsIContent** child)
bool
nsHtml5TreeBuilder::isInStack(nsHtml5StackNode* node)
{
for (PRInt32 i = currentPtr; i >= 0; i--) {
for (int32_t i = currentPtr; i >= 0; i--) {
if (stack[i] == node) {
return true;
}
@@ -3822,7 +3822,7 @@ nsHtml5TreeBuilder::isInForeignButNotHtmlOrMathTextIntegrationPoint()
}
void
nsHtml5TreeBuilder::setFragmentContext(nsIAtom* context, PRInt32 ns, nsIContent** node, bool quirks)
nsHtml5TreeBuilder::setFragmentContext(nsIAtom* context, int32_t ns, nsIContent** node, bool quirks)
{
this->contextName = context;
this->contextNamespace = ns;
@@ -3861,7 +3861,7 @@ nsHtml5TreeBuilder::flushCharacters()
charBufferLen = 0;
return;
}
PRInt32 eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TABLE);
int32_t eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TABLE);
nsHtml5StackNode* node = stack[eltPos];
nsIContent** elt = node->node;
if (!eltPos) {
@@ -3881,7 +3881,7 @@ nsHtml5TreeBuilder::flushCharacters()
bool
nsHtml5TreeBuilder::charBufferContainsNonWhitespace()
{
for (PRInt32 i = 0; i < charBufferLen; i++) {
for (int32_t i = 0; i < charBufferLen; i++) {
switch(charBuffer[i]) {
case ' ':
case '\t':
@@ -3901,8 +3901,8 @@ nsHtml5TreeBuilder::charBufferContainsNonWhitespace()
nsAHtml5TreeBuilderState*
nsHtml5TreeBuilder::newSnapshot()
{
jArray<nsHtml5StackNode*,PRInt32> listCopy = jArray<nsHtml5StackNode*,PRInt32>::newJArray(listPtr + 1);
for (PRInt32 i = 0; i < listCopy.length; i++) {
jArray<nsHtml5StackNode*,int32_t> listCopy = jArray<nsHtml5StackNode*,int32_t>::newJArray(listPtr + 1);
for (int32_t i = 0; i < listCopy.length; i++) {
nsHtml5StackNode* node = listOfActiveFormattingElements[i];
if (node) {
nsHtml5StackNode* newNode = new nsHtml5StackNode(node->getFlags(), node->ns, node->name, node->node, node->popName, node->attributes->cloneAttributes(nullptr));
@@ -3911,10 +3911,10 @@ nsHtml5TreeBuilder::newSnapshot()
listCopy[i] = nullptr;
}
}
jArray<nsHtml5StackNode*,PRInt32> stackCopy = jArray<nsHtml5StackNode*,PRInt32>::newJArray(currentPtr + 1);
for (PRInt32 i = 0; i < stackCopy.length; i++) {
jArray<nsHtml5StackNode*,int32_t> stackCopy = jArray<nsHtml5StackNode*,int32_t>::newJArray(currentPtr + 1);
for (int32_t i = 0; i < stackCopy.length; i++) {
nsHtml5StackNode* node = stack[i];
PRInt32 listIndex = findInListOfActiveFormattingElements(node);
int32_t listIndex = findInListOfActiveFormattingElements(node);
if (listIndex == -1) {
nsHtml5StackNode* newNode = new nsHtml5StackNode(node->getFlags(), node->ns, node->name, node->node, node->popName, nullptr);
stackCopy[i] = newNode;
@@ -3929,14 +3929,14 @@ nsHtml5TreeBuilder::newSnapshot()
bool
nsHtml5TreeBuilder::snapshotMatches(nsAHtml5TreeBuilderState* snapshot)
{
jArray<nsHtml5StackNode*,PRInt32> stackCopy = snapshot->getStack();
PRInt32 stackLen = snapshot->getStackLength();
jArray<nsHtml5StackNode*,PRInt32> listCopy = snapshot->getListOfActiveFormattingElements();
PRInt32 listLen = snapshot->getListOfActiveFormattingElementsLength();
jArray<nsHtml5StackNode*,int32_t> stackCopy = snapshot->getStack();
int32_t stackLen = snapshot->getStackLength();
jArray<nsHtml5StackNode*,int32_t> listCopy = snapshot->getListOfActiveFormattingElements();
int32_t listLen = snapshot->getListOfActiveFormattingElementsLength();
if (stackLen != currentPtr + 1 || listLen != listPtr + 1 || formPointer != snapshot->getFormPointer() || headPointer != snapshot->getHeadPointer() || deepTreeSurrogateParent != snapshot->getDeepTreeSurrogateParent() || mode != snapshot->getMode() || originalMode != snapshot->getOriginalMode() || framesetOk != snapshot->isFramesetOk() || needToDropLF != snapshot->isNeedToDropLF() || quirks != snapshot->isQuirks()) {
return false;
}
for (PRInt32 i = listLen - 1; i >= 0; i--) {
for (int32_t i = listLen - 1; i >= 0; i--) {
if (!listCopy[i] && !listOfActiveFormattingElements[i]) {
continue;
} else if (!listCopy[i] || !listOfActiveFormattingElements[i]) {
@@ -3946,7 +3946,7 @@ nsHtml5TreeBuilder::snapshotMatches(nsAHtml5TreeBuilderState* snapshot)
return false;
}
}
for (PRInt32 i = stackLen - 1; i >= 0; i--) {
for (int32_t i = stackLen - 1; i >= 0; i--) {
if (stackCopy[i]->node != stack[i]->node) {
return false;
}
@@ -3957,27 +3957,27 @@ nsHtml5TreeBuilder::snapshotMatches(nsAHtml5TreeBuilderState* snapshot)
void
nsHtml5TreeBuilder::loadState(nsAHtml5TreeBuilderState* snapshot, nsHtml5AtomTable* interner)
{
jArray<nsHtml5StackNode*,PRInt32> stackCopy = snapshot->getStack();
PRInt32 stackLen = snapshot->getStackLength();
jArray<nsHtml5StackNode*,PRInt32> listCopy = snapshot->getListOfActiveFormattingElements();
PRInt32 listLen = snapshot->getListOfActiveFormattingElementsLength();
for (PRInt32 i = 0; i <= listPtr; i++) {
jArray<nsHtml5StackNode*,int32_t> stackCopy = snapshot->getStack();
int32_t stackLen = snapshot->getStackLength();
jArray<nsHtml5StackNode*,int32_t> listCopy = snapshot->getListOfActiveFormattingElements();
int32_t listLen = snapshot->getListOfActiveFormattingElementsLength();
for (int32_t i = 0; i <= listPtr; i++) {
if (listOfActiveFormattingElements[i]) {
listOfActiveFormattingElements[i]->release();
}
}
if (listOfActiveFormattingElements.length < listLen) {
listOfActiveFormattingElements = jArray<nsHtml5StackNode*,PRInt32>::newJArray(listLen);
listOfActiveFormattingElements = jArray<nsHtml5StackNode*,int32_t>::newJArray(listLen);
}
listPtr = listLen - 1;
for (PRInt32 i = 0; i <= currentPtr; i++) {
for (int32_t i = 0; i <= currentPtr; i++) {
stack[i]->release();
}
if (stack.length < stackLen) {
stack = jArray<nsHtml5StackNode*,PRInt32>::newJArray(stackLen);
stack = jArray<nsHtml5StackNode*,int32_t>::newJArray(stackLen);
}
currentPtr = stackLen - 1;
for (PRInt32 i = 0; i < listLen; i++) {
for (int32_t i = 0; i < listLen; i++) {
nsHtml5StackNode* node = listCopy[i];
if (node) {
nsHtml5StackNode* newNode = new nsHtml5StackNode(node->getFlags(), node->ns, nsHtml5Portability::newLocalFromLocal(node->name, interner), node->node, nsHtml5Portability::newLocalFromLocal(node->popName, interner), node->attributes->cloneAttributes(nullptr));
@@ -3986,9 +3986,9 @@ nsHtml5TreeBuilder::loadState(nsAHtml5TreeBuilderState* snapshot, nsHtml5AtomTab
listOfActiveFormattingElements[i] = nullptr;
}
}
for (PRInt32 i = 0; i < stackLen; i++) {
for (int32_t i = 0; i < stackLen; i++) {
nsHtml5StackNode* node = stackCopy[i];
PRInt32 listIndex = findInArray(node, listCopy);
int32_t listIndex = findInArray(node, listCopy);
if (listIndex == -1) {
nsHtml5StackNode* newNode = new nsHtml5StackNode(node->getFlags(), node->ns, nsHtml5Portability::newLocalFromLocal(node->name, interner), node->node, nsHtml5Portability::newLocalFromLocal(node->popName, interner), nullptr);
stack[i] = newNode;
@@ -4007,10 +4007,10 @@ nsHtml5TreeBuilder::loadState(nsAHtml5TreeBuilderState* snapshot, nsHtml5AtomTab
quirks = snapshot->isQuirks();
}
PRInt32
nsHtml5TreeBuilder::findInArray(nsHtml5StackNode* node, jArray<nsHtml5StackNode*,PRInt32> arr)
int32_t
nsHtml5TreeBuilder::findInArray(nsHtml5StackNode* node, jArray<nsHtml5StackNode*,int32_t> arr)
{
for (PRInt32 i = listPtr; i >= 0; i--) {
for (int32_t i = listPtr; i >= 0; i--) {
if (node == arr[i]) {
return i;
}
@@ -4036,25 +4036,25 @@ nsHtml5TreeBuilder::getDeepTreeSurrogateParent()
return deepTreeSurrogateParent;
}
jArray<nsHtml5StackNode*,PRInt32>
jArray<nsHtml5StackNode*,int32_t>
nsHtml5TreeBuilder::getListOfActiveFormattingElements()
{
return listOfActiveFormattingElements;
}
jArray<nsHtml5StackNode*,PRInt32>
jArray<nsHtml5StackNode*,int32_t>
nsHtml5TreeBuilder::getStack()
{
return stack;
}
PRInt32
int32_t
nsHtml5TreeBuilder::getMode()
{
return mode;
}
PRInt32
int32_t
nsHtml5TreeBuilder::getOriginalMode()
{
return originalMode;
@@ -4078,13 +4078,13 @@ nsHtml5TreeBuilder::isQuirks()
return quirks;
}
PRInt32
int32_t
nsHtml5TreeBuilder::getListOfActiveFormattingElementsLength()
{
return listPtr + 1;
}
PRInt32
int32_t
nsHtml5TreeBuilder::getStackLength()
{
return currentPtr + 1;