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

Backed out changeset 5b706cd241cb (bug 483155) for Valgrind failure on Linux x64 opt. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst
2017-08-11 10:48:10 +02:00
parent 3a324ed193
commit b20f04d43a
39 changed files with 1353 additions and 3443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
parser/html/javasrc/StackNode.java
View File

@@ -48,11 +48,6 @@ final class StackNode<T> {
private int refcount = 0;
/*
* Only valid for formatting elements
*/
// CPPONLY: private @HtmlCreator Object htmlCreator;
// [NOCPP[
private TaintableLocatorImpl locator;
@@ -100,10 +95,6 @@ final class StackNode<T> {
this.refcount = 0;
}
// CPPONLY: public @HtmlCreator Object getHtmlCreator() {
// CPPONLY: return htmlCreator;
// CPPONLY: }
/**
* Setter for copying. This doesn't take another <code>StackNode</code>
* because in C++ the caller is responsible for reobtaining the local names
@@ -117,10 +108,9 @@ final class StackNode<T> {
* @param attributes
*/
void setValues(int flags, @NsUri String ns, @Local String name, T node,
@Local String popName, HtmlAttributes attributes,
// CPPONLY: @HtmlCreator Object htmlCreator
@Local String popName, HtmlAttributes attributes
// [NOCPP[
TaintableLocatorImpl locator
, TaintableLocatorImpl locator
// ]NOCPP]
) {
assert isUnused();
@@ -131,10 +121,6 @@ final class StackNode<T> {
this.node = node;
this.attributes = attributes;
this.refcount = 1;
/*
* Need to track creator for formatting elements when copying.
*/
// CPPONLY: this.htmlCreator = htmlCreator;
// [NOCPP[
this.locator = locator;
// ]NOCPP]
@@ -160,10 +146,6 @@ final class StackNode<T> {
this.attributes = null;
this.refcount = 1;
assert elementName.isInterned() : "Don't use this constructor for custom elements.";
/*
* Not used for formatting elements, so no need to track creator.
*/
// CPPONLY: this.htmlCreator = null;
// [NOCPP[
this.locator = locator;
// ]NOCPP]
@@ -190,11 +172,6 @@ final class StackNode<T> {
this.attributes = attributes;
this.refcount = 1;
assert elementName.isInterned() : "Don't use this constructor for custom elements.";
/*
* Need to track creator for formatting elements in order to be able
* to clone them.
*/
// CPPONLY: this.htmlCreator = elementName.getHtmlCreator();
// [NOCPP[
this.locator = locator;
// ]NOCPP]
@@ -220,10 +197,6 @@ final class StackNode<T> {
this.node = node;
this.attributes = null;
this.refcount = 1;
/*
* Not used for formatting elements, so no need to track creator.
*/
// CPPONLY: this.htmlCreator = null;
// [NOCPP[
this.locator = locator;
// ]NOCPP]
@@ -252,10 +225,6 @@ final class StackNode<T> {
this.node = node;
this.attributes = null;
this.refcount = 1;
/*
* Not used for formatting elements, so no need to track creator.
*/
// CPPONLY: this.htmlCreator = null;
// [NOCPP[
this.locator = locator;
// ]NOCPP]
@@ -284,10 +253,6 @@ final class StackNode<T> {
this.node = node;
this.attributes = null;
this.refcount = 1;
/*
* Not used for formatting elements, so no need to track creator.
*/
// CPPONLY: this.htmlCreator = null;
// [NOCPP[
this.locator = locator;
// ]NOCPP]