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 738108. When restricting to the element subtree in querySelector(All), make sure to disallow the element itself. r=smaug

Browse Source
This commit is contained in:
Boris Zbarsky 2012-03-22 03:09:18 -04:00
parent c862bf7314
commit ecbf4bbd3f
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/base/src/nsGenericElement.cpp
View File

@ -6098,7 +6098,7 @@ ParseSelectorList(nsINode* aNode,
}
// Actually find elements matching aSelectorList (which must not be
// null) and which are descendants of aRoot and put them in Alist. If
// null) and which are descendants of aRoot and put them in aList. If
// onlyFirstMatch, then stop once the first one is found.
template<bool onlyFirstMatch, class T>
inline static nsresult FindMatchingElements(nsINode* aRoot,
@ -6143,8 +6143,9 @@ inline static nsresult FindMatchingElements(nsINode* aRoot,
for (PRInt32 i = 0; i < elements->Count(); ++i) {
Element *element = static_cast<Element*>(elements->ElementAt(i));
if (!aRoot->IsElement() ||
nsContentUtils::ContentIsDescendantOf(element, aRoot)) {
// We have an element with the right id and it's a descendant
(element != aRoot &&
nsContentUtils::ContentIsDescendantOf(element, aRoot))) {
// We have an element with the right id and it's a strict descendant
// of aRoot. Make sure it really matches the selector.
if (nsCSSRuleProcessor::SelectorListMatches(element, matchingContext,
selectorList)) {

1
content/base/test/Makefile.in
View File

@ -570,6 +570,7 @@ _TEST_FILES2 = \
bug696301-script-2.js \
test_bug737565.html \
test_bug737612.html \
test_bug738108.html \
$(NULL)
_CHROME_FILES = \

39
content/base/test/test_bug738108.html Normal file
View File

@ -0,0 +1,39 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=738108
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 738108</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=738108">Mozilla Bug 738108</a>
<p id="display"></p>
<div id="content" style="display: none">
<div id="foo"></div>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 738108 **/
is(document.querySelector("#foo"), $("foo"),
"querySelector on document should find element by id")
is($("content").querySelector("#foo"), $("foo"),
"querySelector on parent element should find element by id")
is($("foo").querySelector("#foo"), null,
"querySelector on element should not find the element itself by id")
is(document.querySelectorAll("#foo").length, 1,
"querySelectorAll on document should find element by id")
is($("content").querySelectorAll("#foo").length, 1,
"querySelectorAll on parent element should find element by id")
is($("foo").querySelectorAll("#foo").length, 0,
"querySelectorall on element should not find the element itself by id")
</script>
</pre>
</body>
</html>