wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 492933 - getElementsByTagName should match on localName not tagName, r=smaug

Browse Source 
dom-level2-core test changes by Ms2ger.
This commit is contained in:
Aryeh Gregor 2015-10-15 10:03:30 -04:00
parent e72fe71dcb
commit 5812e940a1
37 changed files with 75 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/Element.h
View File

@ -37,6 +37,7 @@
#include "mozilla/dom/WindowBinding.h"
#include "mozilla/dom/ElementBinding.h"
#include "Units.h"
#include "nsContentListDeclarations.h"
class nsIFrame;
class nsIDOMMozNamedAttrMap;
@ -61,11 +62,6 @@ namespace dom {
} // namespace mozilla
already_AddRefed<nsContentList>
NS_GetContentList(nsINode* aRootNode,
int32_t aMatchNameSpaceId,
const nsAString& aTagname);
#define ELEMENT_FLAG_BIT(n_) NODE_FLAG_BIT(NODE_TYPE_SPECIFIC_BITS_OFFSET + (n_))
// Element-specific flags

13
dom/base/nsContentList.cpp
View File

@ -840,11 +840,11 @@ nsContentList::Match(Element *aElement)
return false;
mozilla::dom::NodeInfo *ni = aElement->NodeInfo();
bool unknown = mMatchNameSpaceId == kNameSpaceID_Unknown;
bool wildcard = mMatchNameSpaceId == kNameSpaceID_Wildcard;
bool wildcard = mMatchNameSpaceId == kNameSpaceID_Wildcard ||
mMatchNameSpaceId == kNameSpaceID_Unknown;
bool toReturn = mMatchAll;
if (!unknown && !wildcard)
if (!wildcard)
toReturn &= ni->NamespaceEquals(mMatchNameSpaceId);
if (toReturn)
@ -853,11 +853,6 @@ nsContentList::Match(Element *aElement)
bool matchHTML = aElement->GetNameSpaceID() == kNameSpaceID_XHTML &&
aElement->OwnerDoc()->IsHTMLDocument();
if (unknown) {
return matchHTML ? ni->QualifiedNameEquals(mHTMLMatchAtom) :
ni->QualifiedNameEquals(mXMLMatchAtom);
}
if (wildcard) {
return matchHTML ? ni->Equals(mHTMLMatchAtom) :
ni->Equals(mXMLMatchAtom);

5
dom/base/nsContentList.h
View File

@ -209,7 +209,7 @@ public:
* The special value "*" always matches whatever aMatchAtom
* is matched against.
* @param aMatchNameSpaceId If kNameSpaceID_Unknown, then aMatchAtom is the
* tagName to match.
* localName to match.
* If kNameSpaceID_Wildcard, then aMatchAtom is the
* localName to match.
* Otherwise we match nodes whose namespace is
@ -237,7 +237,8 @@ public:
* deeper. If true, then look at the whole subtree rooted at
* our root.
* @param aMatchAtom an atom to be passed back to aFunc
* @param aMatchNameSpaceId a namespace id to be passed back to aFunc
* @param aMatchNameSpaceId a namespace id to be passed back to aFunc. Is
allowed to be kNameSpaceID_Unknown.
* @param aFuncMayDependOnAttr a boolean that indicates whether this list is
* sensitive to attribute changes.
*/

9
dom/base/nsContentListDeclarations.h
View File

@ -9,12 +9,14 @@
#include <stdint.h>
#include "nsCOMPtr.h"
#include "nsStringFwd.h"
class nsContentList;
class nsIAtom;
class nsIContent;
class nsINode;
// Can't use nsStringFwd.h because that's internal-API-only.
class nsString;
class nsAString;
// Magic namespace id that means "match all namespaces". This is
// negative so it won't collide with actual namespace constants.
@ -42,8 +44,9 @@ typedef void* (*nsFuncStringContentListDataAllocator)(nsINode* aRootNode,
// If aMatchNameSpaceId is kNameSpaceID_Unknown, this will return a
// content list which matches ASCIIToLower(aTagname) against HTML
// elements in HTML documents and aTagname against everything else.
// For any other value of aMatchNameSpaceId, the list will match
// aTagname against all elements.
// The comparison is done to the element's localName. For any
// other value of aMatchNameSpaceId, the list will match aTagname
// against all elements, again comparing to the localName.
already_AddRefed<nsContentList>
NS_GetContentList(nsINode* aRootNode,
int32_t aMatchNameSpaceId,

6
dom/base/nsIDocument.h
View File

@ -28,6 +28,7 @@
#include "mozilla/UseCounter.h"
#include "mozilla/WeakPtr.h"
#include "Units.h"
#include "nsContentListDeclarations.h"
#include "nsExpirationTracker.h"
#include "nsClassHashtable.h"
#include "prclist.h"
@ -176,11 +177,6 @@ enum DocumentFlavor {
// Some function forward-declarations
class nsContentList;
already_AddRefed<nsContentList>
NS_GetContentList(nsINode* aRootNode,
int32_t aMatchNameSpaceId,
const nsAString& aTagname);
//----------------------------------------------------------------------
// Document interface. This is implemented by all document objects in

10
dom/base/test/unit/test_nodelist.js
View File

@ -32,7 +32,7 @@ function test_getElementsByTagName()
do_check_eq(doc.getElementById("test2").getElementsByTagName("*").length,
8);
do_check_eq(doc.getElementById("test2").getElementsByTagName("test").length,
3);
7);
// Check that the first element of getElementsByTagName on the document is
// the right thing.
@ -40,7 +40,7 @@ function test_getElementsByTagName()
// Check that we get the right things in the right order
var numTests = doc.getElementsByTagName("test").length;
do_check_eq(numTests, 5);
do_check_eq(numTests, 14);
for (var i = 1; i <= numTests; ++i) {
do_check_true(doc.getElementById("test" + i) instanceof nsIDOMElement);
@ -51,15 +51,15 @@ function test_getElementsByTagName()
// Check that we handle tagnames containing ':' correctly
do_check_true(doc.getElementsByTagName("foo:test")
instanceof nsIDOMNodeList);
do_check_eq(doc.getElementsByTagName("foo:test").length, 2);
do_check_eq(doc.getElementsByTagName("foo:test").length, 0);
do_check_true(doc.getElementsByTagName("foo2:test")
instanceof nsIDOMNodeList);
do_check_eq(doc.getElementsByTagName("foo2:test").length, 3);
do_check_eq(doc.getElementsByTagName("foo2:test").length, 0);
do_check_true(doc.getElementsByTagName("bar:test")
instanceof nsIDOMNodeList);
do_check_eq(doc.getElementsByTagName("bar:test").length, 4);
do_check_eq(doc.getElementsByTagName("bar:test").length, 0);
}
function test_getElementsByTagNameNS()

2
dom/imptests/failures/html/dom/nodes/mochitest.ini
View File

@ -5,9 +5,7 @@ support-files =
[test_Document-createElement-namespace.html.json]
[test_Document-createElementNS.html.json]
[test_Document-getElementsByTagName.html.json]
[test_Node-properties.html.json]
[test_attributes.html.json]
[test_case.html.json]
[test_getElementsByClassName-10.xml.json]
[test_getElementsByClassName-11.xml.json]

4
dom/imptests/failures/html/dom/nodes/test_Document-getElementsByTagName.html.json
View File

@ -1,4 +0,0 @@
{
"Document.getElementsByTagName 1": true,
"Document.getElementsByTagName 2": true
}

4
dom/imptests/failures/html/dom/nodes/test_case.html.json
View File

@ -1,7 +1,5 @@
{
"getElementsByTagName abc": true,
"getElementsByTagName Abc": true,
"getElementsByTagName ABC": true,
"getElementsByTagName \u00e4": true,
"getElementsByTagName \u00c4": true
"getElementsByTagName ABC": true
}

3
dom/imptests/failures/html/dom/nodes/test_getElementsByClassName-10.xml.json
View File

@ -1,3 +0,0 @@
{
"document.getElementsByClassName(): compound": true
}

3
dom/tests/mochitest/dom-level2-core/test_elementsetattributens03.html
View File

@ -100,7 +100,8 @@ function elementsetattributens03() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:employee");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("employee");
element = elementList.item(0);
assertNotNull("empEmployeeNotNull",element);
element.setAttributeNS("http://www.w3.org/DOM/Test/1","defaultAttr","default1");

6
dom/tests/mochitest/dom-level2-core/test_getAttributeNS02.html
View File

@ -105,11 +105,13 @@ function getAttributeNS02() {
}
doc = load(docRef, "doc", "staffNS");
newAttribute = doc.createAttributeNS(namespaceURI,qualifiedName);
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
districtAttr = testAddr.setAttributeNodeNS(newAttribute);
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
attrValue = testAddr.getAttributeNS(namespaceURI,localName);
assertEquals("throw_Equals","",attrValue);

3
dom/tests/mochitest/dom-level2-core/test_getAttributeNS03.html
View File

@ -100,7 +100,8 @@ function getAttributeNS03() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
testAddr.removeAttributeNS(namespaceURI,localName);

3
dom/tests/mochitest/dom-level2-core/test_getAttributeNS04.html
View File

@ -105,7 +105,8 @@ function getAttributeNS04() {
}
doc = load(docRef, "doc", "staffNS");
newAttribute = doc.createAttributeNS(namespaceURI,qualifiedName);
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
testAddr.setAttributeNS(namespaceURI,qualifiedName,"NewValue");

5
dom/tests/mochitest/dom-level2-core/test_getAttributeNS05.html
View File

@ -99,8 +99,9 @@ function getAttributeNS05() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
testAddr = elementList.item(0);
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(3);
assertNotNull("empAddrNotNull",testAddr);
attrValue = testAddr.getAttributeNS("http://www.nist.gov","domestic");
assertEquals("attrValue","Yes",attrValue);

3
dom/tests/mochitest/dom-level2-core/test_getAttributeNodeNS01.html
View File

@ -101,7 +101,8 @@ function getAttributeNodeNS01() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
attribute = testAddr.getAttributeNodeNS(namespaceURI,localName);

5
dom/tests/mochitest/dom-level2-core/test_getAttributeNodeNS02.html
View File

@ -100,8 +100,9 @@ function getAttributeNodeNS02() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
testAddr = elementList.item(0);
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(3);
assertNotNull("empAddrNotNull",testAddr);
attribute = testAddr.getAttributeNodeNS("http://www.nist.gov","domestic");
attrName = attribute.nodeName;

3
dom/tests/mochitest/dom-level2-core/test_hasAttributeNS03.html
View File

@ -100,7 +100,8 @@ function hasAttributeNS03() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testNode = elementList.item(0);
assertNotNull("empAddrNotNull",testNode);
state = testNode.hasAttributeNS(namespaceURI,localName);

3
dom/tests/mochitest/dom-level2-core/test_hasAttributeNS04.html
View File

@ -102,7 +102,8 @@ function hasAttributeNS04() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testNode = elementList.item(0);
assertNotNull("empAddressNotNull",testNode);
state = testNode.hasAttributeNS(namespaceURI,localName);

5
dom/tests/mochitest/dom-level2-core/test_importNode05.html
View File

@ -119,8 +119,9 @@ function importNode05() {
aNewDocRef = this.aNewDoc;
}
aNewDoc = load(aNewDocRef, "aNewDoc", "staffNS");
addresses = aNewDoc.getElementsByTagName("emp:address");
element = addresses.item(0);
// Changed for bug 492933.
addresses = aNewDoc.getElementsByTagName("address");
element = addresses.item(3);
assertNotNull("empAddressNotNull",element);
aNode = doc.importNode(element,false);
hasChild = aNode.hasChildNodes();

5
dom/tests/mochitest/dom-level2-core/test_importNode06.html
View File

@ -117,8 +117,9 @@ function importNode06() {
aNewDocRef = this.aNewDoc;
}
aNewDoc = load(aNewDocRef, "aNewDoc", "staffNS");
addresses = aNewDoc.getElementsByTagName("emp:address");
element = addresses.item(0);
// Changed for bug 492933.
addresses = aNewDoc.getElementsByTagName("address");
element = addresses.item(3);
assertNotNull("empAddressNotNull",element);
aNode = doc.importNode(element,true);
hasChild = aNode.hasChildNodes();

5
dom/tests/mochitest/dom-level2-core/test_localName01.html
View File

@ -101,8 +101,9 @@ function localName01() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
testAddr = elementList.item(0);
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(3);
assertNotNull("empAddrNotNull",testAddr);
addrAttr = testAddr.getAttributeNode("emp:domestic");
localName = addrAttr.localName;

5
dom/tests/mochitest/dom-level2-core/test_namespaceURI02.html
View File

@ -99,8 +99,9 @@ function namespaceURI02() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
testAddr = elementList.item(0);
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(3);
assertNotNull("empAddressNotNull",testAddr);
addrAttr = testAddr.getAttributeNodeNS("http://www.nist.gov","domestic");
attrNamespaceURI = addrAttr.namespaceURI;

3
dom/tests/mochitest/dom-level2-core/test_nodehasattributes03.html
View File

@ -94,7 +94,8 @@ function nodehasattributes03() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:employee");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("employee");
element = elementList.item(0);
assertNotNull("empEmployeeNotNull",element);
hasAttributes = element.hasAttributes();

3
dom/tests/mochitest/dom-level2-core/test_prefix02.html
View File

@ -100,7 +100,8 @@ function prefix02() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:employeeId");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("employeeId");
testEmployee = elementList.item(0);
assertNotNull("empEmployeeNotNull",testEmployee);
textNode = testEmployee.firstChild;

5
dom/tests/mochitest/dom-level2-core/test_prefix03.html
View File

@ -97,8 +97,9 @@ function prefix03() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:employee");
testEmployee = elementList.item(0);
// Changed for bug 492933.
elementList = doc.getElementsByTagName("employee");
testEmployee = elementList.item(3);
assertNotNull("empEmployeeNotNull",testEmployee);
prefix = testEmployee.prefix;

3
dom/tests/mochitest/dom-level2-core/test_setAttributeNS02.html
View File

@ -100,7 +100,8 @@ function setAttributeNS02() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:employee");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("employee");
testAddr = elementList.item(0);
{

3
dom/tests/mochitest/dom-level2-core/test_setAttributeNS04.html
View File

@ -108,7 +108,8 @@ function setAttributeNS04() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
testAddr.setAttributeNS("http://www.nist.gov","newprefix:zone","newValue");

3
dom/tests/mochitest/dom-level2-core/test_setAttributeNS05.html
View File

@ -106,7 +106,8 @@ function setAttributeNS05() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
testAddr.setAttributeNS(namespaceURI,qualifiedName,"<newValue>");

3
dom/tests/mochitest/dom-level2-core/test_setAttributeNS09.html
View File

@ -108,7 +108,8 @@ function setAttributeNS09() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
testAddr.setAttributeNS(namespaceURI,qualifiedName,"newValue");

3
dom/tests/mochitest/dom-level2-core/test_setAttributeNodeNS01.html
View File

@ -111,7 +111,8 @@ function setAttributeNodeNS01() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
newElement = doc.createElement("newElement");

3
dom/tests/mochitest/dom-level2-core/test_setAttributeNodeNS03.html
View File

@ -104,7 +104,8 @@ function setAttributeNodeNS03() {
docRef = this.doc;
}
doc = load(docRef, "doc", "staffNS");
elementList = doc.getElementsByTagName("emp:address");
// Changed for bug 492933.
elementList = doc.getElementsByTagName("address");
testAddr = elementList.item(0);
assertNotNull("empAddrNotNull",testAddr);
newAttr = doc.createAttributeNS(namespaceURI,qualifiedName);

2
layout/reftests/dom/xbl-children-4.xhtml
View File

@ -18,7 +18,7 @@
document.head.appendChild(newSheet);
/* Now, append a frame to our children element, causing the pending restyle to descend into it. */
var children = document.getElementsByTagName("xbl:children")[0];
var children = document.getElementsByTagName("children")[0];
var span = document.createElementNS("http://www.w3.org/1999/xhtml", "span");
span.appendChild(document.createTextNode("PASS"));
children.appendChild(span);

14
testing/web-platform/meta/dom/nodes/Document-getElementsByTagName.html.ini
View File

@ -1,14 +0,0 @@
[Document-getElementsByTagName.html]
type: testharness
[Element in non-HTML namespace, prefix, lowercase name]
expected: FAIL
[Element in non-HTML namespace, prefix, uppercase name]
expected: FAIL
[Element in HTML namespace, prefix, non-ascii characters in name]
expected: FAIL
[Element in non-HTML namespace, prefix, non-ascii characters in name]
expected: FAIL

14
testing/web-platform/meta/dom/nodes/Document-getElementsByTagName.xhtml.ini
View File

@ -1,14 +0,0 @@
[Document-getElementsByTagName.xhtml]
type: testharness
[Element in non-HTML namespace, prefix, lowercase name]
expected: FAIL
[Element in non-HTML namespace, prefix, uppercase name]
expected: FAIL
[Element in HTML namespace, prefix, non-ascii characters in name]
expected: FAIL
[Element in non-HTML namespace, prefix, non-ascii characters in name]
expected: FAIL

14
testing/web-platform/meta/dom/nodes/Element-getElementsByTagName.html.ini
View File

@ -1,14 +0,0 @@
[Element-getElementsByTagName.html]
type: testharness
[Element in non-HTML namespace, prefix, lowercase name]
expected: FAIL
[Element in non-HTML namespace, prefix, uppercase name]
expected: FAIL
[Element in HTML namespace, prefix, non-ascii characters in name]
expected: FAIL
[Element in non-HTML namespace, prefix, non-ascii characters in name]
expected: FAIL

17
testing/web-platform/meta/dom/nodes/case.html.ini
View File

@ -1,17 +0,0 @@
[case.html]
type: testharness
[getElementsByTagName a:abc]
expected: FAIL
[getElementsByTagName a:Abc]
expected: FAIL
[getElementsByTagName a:ABC]
expected: FAIL
[getElementsByTagName a:ä]
expected: FAIL
[getElementsByTagName a:Ä]
expected: FAIL