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

Backed out 8 changesets (bug 959150) for Linux debug build bustage on a CLOSED TREE.

Browse Source 
Backed out changeset 30bdc9b15e8e (bug 959150)
Backed out changeset 630e489aed30 (bug 959150)
Backed out changeset c6874004efe7 (bug 959150)
Backed out changeset ebc67518a962 (bug 959150)
Backed out changeset 14441e528582 (bug 959150)
Backed out changeset 8d0ae8bffb08 (bug 959150)
Backed out changeset 603b63c33e9a (bug 959150)
Backed out changeset 261e2d244c54 (bug 959150)
This commit is contained in:
Ryan VanderMeulen
2014-03-05 15:26:07 -05:00
parent aeec35c408
commit 35226d8b0a
45 changed files with 1030 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
parser/html/javasrc/Tokenizer.java
View File

@@ -497,12 +497,12 @@ public class Tokenizer implements Locator {
private boolean html4ModeCompatibleWithXhtml1Schemata;
private final boolean newAttributesEachTime;
private int mappingLangToXmlLang;
// ]NOCPP]
private final boolean newAttributesEachTime;
private boolean shouldSuspend;
protected boolean confident;
@@ -554,12 +554,8 @@ public class Tokenizer implements Locator {
this.doctypeName = null;
this.publicIdentifier = null;
this.systemIdentifier = null;
// [NOCPP[
this.attributes = null;
// ]NOCPP]
// CPPONLY: this.attributes = tokenHandler.HasBuilder() ? new HtmlAttributes(mappingLangToXmlLang) : null;
// CPPONLY: this.newAttributesEachTime = !tokenHandler.HasBuilder();
// CPPONLY: this.viewingXmlSource = viewingXmlSource;
// CPPONLY: this.viewingXmlSource = viewingXmlSource;
}
public void setInterner(Interner interner) {
@@ -1100,6 +1096,21 @@ public class Tokenizer implements Locator {
errorHandler.warning(spe);
}
/**
*
*/
private void resetAttributes() {
// [NOCPP[
if (newAttributesEachTime) {
// ]NOCPP]
attributes = null;
// [NOCPP[
} else {
attributes.clear(mappingLangToXmlLang);
}
// ]NOCPP]
}
private void strBufToElementNameString() {
// if (strBufOffset != -1) {
// return ElementName.elementNameByBuffer(buf, strBufOffset, strBufLen);
@@ -1125,26 +1136,17 @@ public class Tokenizer implements Locator {
// CPPONLY: if (!viewingXmlSource) {
tokenHandler.endTag(tagName);
// CPPONLY: }
// CPPONLY: if (newAttributesEachTime) {
// CPPONLY: Portability.delete(attributes);
// CPPONLY: attributes = null;
// CPPONLY: }
Portability.delete(attributes);
} else {
// CPPONLY: if (viewingXmlSource) {
// CPPONLY: assert newAttributesEachTime;
// CPPONLY: Portability.delete(attributes);
// CPPONLY: attributes = null;
// CPPONLY: Portability.delete(attributes);
// CPPONLY: } else {
tokenHandler.startTag(tagName, attrs, selfClosing);
// CPPONLY: }
}
tagName.release();
tagName = null;
if (newAttributesEachTime) {
attributes = null;
} else {
attributes.clear(mappingLangToXmlLang);
}
resetAttributes();
/*
* The token handler may have called setStateAndEndTagExpectation
* and changed stateSave since the start of this method.
@@ -6595,11 +6597,11 @@ public class Tokenizer implements Locator {
attributeName = null;
}
tokenHandler.endTokenization();
// [NOCPP[
if (attributes != null) {
attributes.clear(mappingLangToXmlLang);
Portability.delete(attributes);
attributes = null;
}
// ]NOCPP]
}
public void requestSuspension() {
@@ -6678,12 +6680,16 @@ public class Tokenizer implements Locator {
attributeName.release();
attributeName = null;
}
// [NOCPP[
if (newAttributesEachTime) {
// ]NOCPP]
if (attributes != null) {
Portability.delete(attributes);
attributes = null;
}
// [NOCPP[
}
// ]NOCPP]
}
public void loadState(Tokenizer other) throws SAXException {
@@ -6999,8 +7005,6 @@ public class Tokenizer implements Locator {
void destructor() {
// The translator will write refcount tracing stuff here
Portability.delete(attributes);
attributes = null;
}
// [NOCPP[