Uncomment NodeFilter constants

servo · Apr 13, 2015 · 98e2dc5 · 98e2dc5
1 parent 1f9c2f9
commit 98e2dc5
Show file tree

Hide file tree

Showing 5 changed files with 2,236 additions and 166 deletions.
diff --git a/components/script/dom/webidls/NodeFilter.webidl b/components/script/dom/webidls/NodeFilter.webidl
@@ -10,24 +10,24 @@
 
 callback interface NodeFilter {
   // Constants for acceptNode()
-  // const unsigned short FILTER_ACCEPT = 1;
-  // const unsigned short FILTER_REJECT = 2;
-  // const unsigned short FILTER_SKIP = 3;
+  const unsigned short FILTER_ACCEPT = 1;
+  const unsigned short FILTER_REJECT = 2;
+  const unsigned short FILTER_SKIP = 3;
 
   // Constants for whatToShow
-  // const unsigned long SHOW_ALL = 0xFFFFFFFF;
-  // const unsigned long SHOW_ELEMENT = 0x1;
-  // const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
-  // const unsigned long SHOW_TEXT = 0x4;
-  // const unsigned long SHOW_CDATA_SECTION = 0x8; // historical
-  // const unsigned long SHOW_ENTITY_REFERENCE = 0x10; // historical
-  // const unsigned long SHOW_ENTITY = 0x20; // historical
-  // const unsigned long SHOW_PROCESSING_INSTRUCTION = 0x40;
-  // const unsigned long SHOW_COMMENT = 0x80;
-  // const unsigned long SHOW_DOCUMENT = 0x100;
-  // const unsigned long SHOW_DOCUMENT_TYPE = 0x200;
-  // const unsigned long SHOW_DOCUMENT_FRAGMENT = 0x400;
-  // const unsigned long SHOW_NOTATION = 0x800; // historical
+  const unsigned long SHOW_ALL = 0xFFFFFFFF;
+  const unsigned long SHOW_ELEMENT = 0x1;
+  const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
+  const unsigned long SHOW_TEXT = 0x4;
+  const unsigned long SHOW_CDATA_SECTION = 0x8; // historical
+  const unsigned long SHOW_ENTITY_REFERENCE = 0x10; // historical
+  const unsigned long SHOW_ENTITY = 0x20; // historical
+  const unsigned long SHOW_PROCESSING_INSTRUCTION = 0x40;
+  const unsigned long SHOW_COMMENT = 0x80;
+  const unsigned long SHOW_DOCUMENT = 0x100;
+  const unsigned long SHOW_DOCUMENT_TYPE = 0x200;
+  const unsigned long SHOW_DOCUMENT_FRAGMENT = 0x400;
+  const unsigned long SHOW_NOTATION = 0x800; // historical
 
   unsigned short acceptNode(Node node);
 };
diff --git a/tests/wpt/metadata/dom/interface-objects.html.ini b/tests/wpt/metadata/dom/interface-objects.html.ini
@@ -1,8 +1,5 @@
 [interface-objects.html]
   type: testharness
-  [Should be able to delete NodeFilter.]
-    expected: FAIL
-
   [Should be able to delete DOMStringList.]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/dom/interfaces.html.ini b/tests/wpt/metadata/dom/interfaces.html.ini
@@ -804,45 +804,6 @@
   [NodeIterator interface: document.createNodeIterator(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "detach" with the proper type (7)]
     expected: FAIL
 
-  [TreeWalker must be primary interface of document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false)]
-    expected: FAIL
-
-  [Stringification of document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "root" with the proper type (0)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "whatToShow" with the proper type (1)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "filter" with the proper type (2)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "currentNode" with the proper type (3)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "parentNode" with the proper type (4)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "firstChild" with the proper type (5)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "lastChild" with the proper type (6)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "previousSibling" with the proper type (7)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "nextSibling" with the proper type (8)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "previousNode" with the proper type (9)]
-    expected: FAIL
-
-  [TreeWalker interface: document.createTreeWalker(document.body, NodeFilter.SHOW_ALL, null, false) must inherit property "nextNode" with the proper type (10)]
-    expected: FAIL
-
   [DOMTokenList interface: operation toggle(DOMString,boolean)]
     expected: FAIL
 
@@ -1008,108 +969,3 @@
   [NodeFilter interface: existence and properties of interface object]
     expected: FAIL
 
-  [NodeFilter interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: existence and properties of interface prototype object\'s "constructor" property]
-    expected: FAIL
-
-  [NodeFilter interface: constant FILTER_ACCEPT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant FILTER_ACCEPT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant FILTER_REJECT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant FILTER_REJECT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant FILTER_SKIP on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant FILTER_SKIP on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ALL on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ALL on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ELEMENT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ELEMENT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ATTRIBUTE on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ATTRIBUTE on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_TEXT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_TEXT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_CDATA_SECTION on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_CDATA_SECTION on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ENTITY_REFERENCE on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ENTITY_REFERENCE on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ENTITY on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_ENTITY on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_PROCESSING_INSTRUCTION on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_PROCESSING_INSTRUCTION on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_COMMENT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_COMMENT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_DOCUMENT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_DOCUMENT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_DOCUMENT_TYPE on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_DOCUMENT_TYPE on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_DOCUMENT_FRAGMENT on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_DOCUMENT_FRAGMENT on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_NOTATION on interface object]
-    expected: FAIL
-
-  [NodeFilter interface: constant SHOW_NOTATION on interface prototype object]
-    expected: FAIL
-
-  [NodeFilter interface: operation acceptNode(Node)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/dom/traversal/NodeFilter-constants.html.ini b/tests/wpt/metadata/dom/traversal/NodeFilter-constants.html.ini