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

Bug 612529 part 1 - Pack the dispatch group and the flags of an element into one 32-bit bitfield. r=jonas, a=blocking2.0-betaN.

Browse Source
This commit is contained in:
Henri Sivonen
2010-12-09 11:27:57 +02:00
parent 0235456254
commit b40e883623
11 changed files with 1057 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
parser/html/javasrc/TreeBuilder.java
View File

@@ -1327,7 +1327,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
case IN_BODY:
// [NOCPP[
openelementloop: for (int i = currentPtr; i >= 0; i--) {
int group = stack[i].group;
int group = stack[i].getGroup();
switch (group) {
case DD_OR_DT:
case LI:
@@ -1445,12 +1445,12 @@ public abstract class TreeBuilder<T> implements TokenHandler,
needToDropLF = false;
boolean needsPostProcessing = false;
starttagloop: for (;;) {
int group = elementName.group;
int group = elementName.getGroup();
@Local String name = elementName.name;
if (inForeign) {
StackNode<T> currentNode = stack[currentPtr];
@NsUri String currNs = currentNode.ns;
int currGroup = currentNode.group;
int currGroup = currentNode.getGroup();
if (("http://www.w3.org/1999/xhtml" == currNs)
|| ("http://www.w3.org/1998/Math/MathML" == currNs && ((MGLYPH_OR_MALIGNMARK != group && MI_MO_MN_MS_MTEXT == currGroup) || (SVG == group && ANNOTATION_XML == currGroup)))
|| ("http://www.w3.org/2000/svg" == currNs && (TITLE == currGroup || (FOREIGNOBJECT_OR_DESC == currGroup)))) {
@@ -1763,7 +1763,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
switch (group) {
case FRAMESET:
if (mode == FRAMESET_OK) {
if (currentPtr == 0 || stack[1].group != BODY) {
if (currentPtr == 0 || stack[1].getGroup() != BODY) {
assert fragment;
err("Stray \u201Cframeset\u201D start tag.");
break starttagloop;
@@ -1850,7 +1850,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
break starttagloop;
case H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6:
implicitlyCloseP();
if (stack[currentPtr].group == H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6) {
if (stack[currentPtr].getGroup() == H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6) {
err("Heading cannot be a child of another heading.");
pop();
}
@@ -1890,7 +1890,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (;;) {
StackNode<T> node = stack[eltPos]; // weak
// ref
if (node.group == group) { // LI or
if (node.getGroup() == group) { // LI or
// DD_OR_DT
generateImpliedEndTagsExceptFor(node.name);
if (errorHandler != null
@@ -1901,8 +1901,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
pop();
}
break;
} else if (node.scoping
|| (node.special
} else if (node.isScoping()
|| (node.isSpecial()
&& node.name != "p"
&& node.name != "address" && node.name != "div")) {
break;
@@ -2928,11 +2928,11 @@ public abstract class TreeBuilder<T> implements TokenHandler,
return true;
}
if (ns == "http://www.w3.org/2000/svg") {
return stackNode.group == FOREIGNOBJECT_OR_DESC
|| stackNode.group == TITLE;
return stackNode.getGroup() == FOREIGNOBJECT_OR_DESC
|| stackNode.getGroup() == TITLE;
}
assert ns == "http://www.w3.org/1998/Math/MathML" : "Unexpected namespace.";
return stackNode.group == MI_MO_MN_MS_MTEXT;
return stackNode.getGroup() == MI_MO_MN_MS_MTEXT;
}
/**
@@ -3133,7 +3133,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
flushCharacters();
needToDropLF = false;
int eltPos;
int group = elementName.group;
int group = elementName.getGroup();
@Local String name = elementName.name;
endtagloop: for (;;) {
assert !inForeign || currentPtr >= 0 : "In foreign without a root element?";
@@ -3366,7 +3366,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
assert currentPtr >= 1;
if (errorHandler != null) {
uncloseloop1: for (int i = 2; i <= currentPtr; i++) {
switch (stack[i].group) {
switch (stack[i].getGroup()) {
case DD_OR_DT:
case LI:
case OPTGROUP:
@@ -3392,7 +3392,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
}
if (errorHandler != null) {
uncloseloop2: for (int i = 0; i <= currentPtr; i++) {
switch (stack[i].group) {
switch (stack[i].getGroup()) {
case DD_OR_DT:
case LI:
case P:
@@ -3617,7 +3617,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
pop();
}
break endtagloop;
} else if (node.scoping || node.special) {
} else if (node.isScopingOrSpecial()) {
err("Stray end tag \u201C" + name
+ "\u201D.");
break endtagloop;
@@ -3899,7 +3899,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
private int findLastInTableScopeOrRootTbodyTheadTfoot() {
for (int i = currentPtr; i > 0; i--) {
if (stack[i].group == TreeBuilder.TBODY_OR_THEAD_OR_TFOOT) {
if (stack[i].getGroup() == TreeBuilder.TBODY_OR_THEAD_OR_TFOOT) {
return i;
}
}
@@ -3930,7 +3930,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (int i = currentPtr; i > 0; i--) {
if (stack[i].name == name) {
return i;
} else if (stack[i].scoping || stack[i].name == "button") {
} else if (stack[i].isScoping() || stack[i].name == "button") {
return TreeBuilder.NOT_FOUND_ON_STACK;
}
}
@@ -3941,7 +3941,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (int i = currentPtr; i > 0; i--) {
if (stack[i].name == name) {
return i;
} else if (stack[i].scoping) {
} else if (stack[i].isScoping()) {
return TreeBuilder.NOT_FOUND_ON_STACK;
}
}
@@ -3952,7 +3952,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (int i = currentPtr; i > 0; i--) {
if (stack[i].name == name) {
return i;
} else if (stack[i].scoping || stack[i].name == "ul" || stack[i].name == "ol") {
} else if (stack[i].isScoping() || stack[i].name == "ul" || stack[i].name == "ol") {
return TreeBuilder.NOT_FOUND_ON_STACK;
}
}
@@ -3961,9 +3961,9 @@ public abstract class TreeBuilder<T> implements TokenHandler,
private int findLastInScopeHn() {
for (int i = currentPtr; i > 0; i--) {
if (stack[i].group == TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6) {
if (stack[i].getGroup() == TreeBuilder.H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6) {
return i;
} else if (stack[i].scoping) {
} else if (stack[i].isScoping()) {
return TreeBuilder.NOT_FOUND_ON_STACK;
}
}
@@ -3974,7 +3974,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (int i = currentPtr; i > 0; i--) {
if (stack[i].ns != "http://www.w3.org/1999/xhtml") {
return true;
} else if (stack[i].scoping) {
} else if (stack[i].isScoping()) {
return false;
}
}
@@ -3985,7 +3985,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
throws SAXException {
for (;;) {
StackNode<T> node = stack[currentPtr];
switch (node.group) {
switch (node.getGroup()) {
case P:
case LI:
case DD_OR_DT:
@@ -4005,7 +4005,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
private void generateImpliedEndTags() throws SAXException {
for (;;) {
switch (stack[currentPtr].group) {
switch (stack[currentPtr].getGroup()) {
case P:
case LI:
case DD_OR_DT:
@@ -4021,7 +4021,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
}
private boolean isSecondOnStackBody() {
return currentPtr >= 1 && stack[1].group == TreeBuilder.BODY;
return currentPtr >= 1 && stack[1].getGroup() == TreeBuilder.BODY;
}
private void documentModeInternal(DocumentMode m, String publicIdentifier,
@@ -4366,7 +4366,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
StackNode<T> node = stack[formattingEltStackPos]; // weak ref
if (node == formattingElt) {
break;
} else if (node.scoping) {
} else if (node.isScoping()) {
inScope = false;
}
formattingEltStackPos--;
@@ -4387,7 +4387,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
int furthestBlockPos = formattingEltStackPos + 1;
while (furthestBlockPos <= currentPtr) {
StackNode<T> node = stack[furthestBlockPos]; // weak ref
if (node.scoping || node.special) {
if (node.isScopingOrSpecial()) {
break;
}
furthestBlockPos++;
@@ -4432,9 +4432,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
assert node == stack[nodePos];
T clone = createElement("http://www.w3.org/1999/xhtml",
node.name, node.attributes.cloneAttributes(null));
StackNode<T> newNode = new StackNode<T>(node.group, node.ns,
node.name, clone, node.scoping, node.special,
node.fosterParenting, node.popName, node.attributes); // creation
StackNode<T> newNode = new StackNode<T>(node.getFlags(), node.ns,
node.name, clone, node.popName, node.attributes); // creation
// ownership
// goes
// to
@@ -4452,7 +4451,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
appendElement(lastNode.node, node.node);
lastNode = node;
}
if (commonAncestor.fosterParenting) {
if (commonAncestor.isFosterParenting()) {
fatal();
detachFromParent(lastNode.node);
insertIntoFosterParent(lastNode.node);
@@ -4464,9 +4463,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
formattingElt.name,
formattingElt.attributes.cloneAttributes(null));
StackNode<T> formattingClone = new StackNode<T>(
formattingElt.group, formattingElt.ns, formattingElt.name,
clone, formattingElt.scoping, formattingElt.special,
formattingElt.fosterParenting, formattingElt.popName,
formattingElt.getFlags(), formattingElt.ns, formattingElt.name,
clone, formattingElt.popName,
formattingElt.attributes); // Ownership
// transfers
// to
@@ -4568,7 +4566,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
private int findLastOrRoot(int group) {
for (int i = currentPtr; i > 0; i--) {
if (stack[i].group == group) {
if (stack[i].getGroup() == group) {
return i;
}
}
@@ -4588,7 +4586,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
// ]NOCPP]
if (currentPtr >= 1) {
StackNode<T> body = stack[1];
if (body.group == TreeBuilder.BODY) {
if (body.getGroup() == TreeBuilder.BODY) {
addAttributesToElement(body.node, attributes);
return true;
}
@@ -4643,12 +4641,11 @@ public abstract class TreeBuilder<T> implements TokenHandler,
StackNode<T> entry = listOfActiveFormattingElements[entryPos];
T clone = createElement("http://www.w3.org/1999/xhtml", entry.name,
entry.attributes.cloneAttributes(null));
StackNode<T> entryClone = new StackNode<T>(entry.group, entry.ns,
entry.name, clone, entry.scoping, entry.special,
entry.fosterParenting, entry.popName, entry.attributes);
StackNode<T> entryClone = new StackNode<T>(entry.getFlags(), entry.ns,
entry.name, clone, entry.popName, entry.attributes);
entry.dropAttributes(); // transfer ownership to entryClone
StackNode<T> currentNode = stack[currentPtr];
if (currentNode.fosterParenting) {
if (currentNode.isFosterParenting()) {
insertIntoFosterParent(clone);
} else {
appendElement(clone, currentNode.node);
@@ -4851,7 +4848,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
formPointer = elt;
Portability.retainElement(formPointer);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -4872,7 +4869,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
// This method can't be called for custom elements
T elt = createElement(ns, elementName.name, attributes);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -4906,13 +4903,13 @@ public abstract class TreeBuilder<T> implements TokenHandler,
@Local String popName = elementName.name;
// [NOCPP[
checkAttributes(attributes, ns);
if (elementName.custom) {
if (elementName.isCustom()) {
popName = checkPopName(popName);
}
// ]NOCPP]
T elt = createElement(ns, popName, attributes);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -4929,13 +4926,13 @@ public abstract class TreeBuilder<T> implements TokenHandler,
@Local String popName = elementName.name;
// [NOCPP[
checkAttributes(attributes, ns);
if (elementName.custom) {
if (elementName.isCustom()) {
popName = checkPopName(popName);
}
// ]NOCPP]
T elt = createElement(ns, popName, attributes);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -4953,13 +4950,13 @@ public abstract class TreeBuilder<T> implements TokenHandler,
@Local String popName = elementName.camelCaseName;
// [NOCPP[
checkAttributes(attributes, ns);
if (elementName.custom) {
if (elementName.isCustom()) {
popName = checkPopName(popName);
}
// ]NOCPP]
T elt = createElement(ns, popName, attributes);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -4981,7 +4978,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
T elt = createElement(ns, elementName.name, attributes, fragment ? null
: form);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -5001,7 +4998,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
// Can't be called for custom elements
T elt = createElement(ns, name, attributes, fragment ? null : form);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -5018,13 +5015,13 @@ public abstract class TreeBuilder<T> implements TokenHandler,
@Local String popName = elementName.name;
// [NOCPP[
checkAttributes(attributes, ns);
if (elementName.custom) {
if (elementName.isCustom()) {
popName = checkPopName(popName);
}
// ]NOCPP]
T elt = createElement(ns, popName, attributes);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -5041,13 +5038,13 @@ public abstract class TreeBuilder<T> implements TokenHandler,
@Local String popName = elementName.camelCaseName;
// [NOCPP[
checkAttributes(attributes, ns);
if (elementName.custom) {
if (elementName.isCustom()) {
popName = checkPopName(popName);
}
// ]NOCPP]
T elt = createElement(ns, popName, attributes);
StackNode<T> current = stack[currentPtr];
if (current.fosterParenting) {
if (current.isFosterParenting()) {
fatal();
insertIntoFosterParent(elt);
} else {
@@ -5332,7 +5329,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
&& charBufferContainsNonWhitespace()) {
err("Misplaced non-space characters insided a table.");
reconstructTheActiveFormattingElements();
if (!stack[currentPtr].fosterParenting) {
if (!stack[currentPtr].isFosterParenting()) {
// reconstructing gave us a new current node
appendCharacters(currentNode(), charBuffer, 0,
charBufferLen);
@@ -5388,9 +5385,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (int i = 0; i < listCopy.length; i++) {
StackNode<T> node = listOfActiveFormattingElements[i];
if (node != null) {
StackNode<T> newNode = new StackNode<T>(node.group, node.ns,
node.name, node.node, node.scoping, node.special,
node.fosterParenting, node.popName,
StackNode<T> newNode = new StackNode<T>(node.getFlags(), node.ns,
node.name, node.node, node.popName,
node.attributes.cloneAttributes(null));
listCopy[i] = newNode;
} else {
@@ -5402,9 +5398,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
StackNode<T> node = stack[i];
int listIndex = findInListOfActiveFormattingElements(node);
if (listIndex == -1) {
StackNode<T> newNode = new StackNode<T>(node.group, node.ns,
node.name, node.node, node.scoping, node.special,
node.fosterParenting, node.popName,
StackNode<T> newNode = new StackNode<T>(node.getFlags(), node.ns,
node.name, node.node, node.popName,
null);
stackCopy[i] = newNode;
} else {
@@ -5485,9 +5480,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
for (int i = 0; i < listLen; i++) {
StackNode<T> node = listCopy[i];
if (node != null) {
StackNode<T> newNode = new StackNode<T>(node.group, node.ns,
StackNode<T> newNode = new StackNode<T>(node.getFlags(), node.ns,
Portability.newLocalFromLocal(node.name, interner), node.node,
node.scoping, node.special, node.fosterParenting,
Portability.newLocalFromLocal(node.popName, interner),
node.attributes.cloneAttributes(null));
listOfActiveFormattingElements[i] = newNode;
@@ -5499,9 +5493,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
StackNode<T> node = stackCopy[i];
int listIndex = findInArray(node, listCopy);
if (listIndex == -1) {
StackNode<T> newNode = new StackNode<T>(node.group, node.ns,
StackNode<T> newNode = new StackNode<T>(node.getFlags(), node.ns,
Portability.newLocalFromLocal(node.name, interner), node.node,
node.scoping, node.special, node.fosterParenting,
Portability.newLocalFromLocal(node.popName, interner),
null);
stack[i] = newNode;