| author | Cameron McCormack <cam@mcc.id.au> |
| Thu, 01 Dec 2016 09:25:21 +0800 | |
| changeset 325162 | 523009ae06f6378061f2a9f4429884c33417bb7d |
| parent 325161 | bee6662585ed87109cb2ab1b05a16984025c95af |
| child 325163 | 9ccafe6922c61dd962c4da4f3f1edc7e3ac8746e |
| push id | 84611 |
| push user | cmccormack@mozilla.com |
| push date | Sat, 03 Dec 2016 07:45:16 +0000 |
| treeherder | mozilla-inbound@523009ae06f6 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | mrbkap |
| bugs | 1320000 |
| milestone | 53.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/xbl/XBLChildrenElement.cpp +++ b/dom/xbl/XBLChildrenElement.cpp @@ -49,17 +49,18 @@ XBLChildrenElement::ParseAttribute(int32 mIncludes.Clear(); nsCharSeparatedTokenizer tok(aValue, '|', nsCharSeparatedTokenizer::SEPARATOR_OPTIONAL); while (tok.hasMoreTokens()) { mIncludes.AppendElement(NS_Atomize(tok.nextToken())); } } - return false; + return nsXMLElement::ParseAttribute(aNamespaceID, aAttribute, + aValue, aResult); } } // namespace dom } // namespace mozilla using namespace mozilla::dom; NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsAnonymousContentList, mParent)
--- a/layout/reftests/dom/reftest.list +++ b/layout/reftests/dom/reftest.list @@ -45,11 +45,11 @@ # test appending some nodes whose frame construction should be done lazily # followed by appending a node that might not be done lazily == multipleappendwithxul.xhtml multipleappendwithxul-ref.xhtml == multipleappendwithinput.xhtml multipleappendwithinput-ref.xhtml == multipleappendwitheditable.xhtml multipleappendwitheditable-ref.xhtml == xbl-children-1.xhtml xbl-children-1-ref.xhtml -fails == xbl-children-2.xhtml about:blank +== xbl-children-2.xhtml about:blank == xbl-children-3.xhtml xbl-children-3-ref.html -== xbl-children-4.xhtml xbl-children-4-ref.html +== xbl-children-4.xhtml about:blank
deleted file mode 100644 --- a/layout/reftests/dom/xbl-children-4-ref.html +++ /dev/null @@ -1,7 +0,0 @@ -<html> - <body> - <div> - <span>PASS</span> - </div> - </body> -</html>
--- a/layout/reftests/dom/xbl-children-4.xhtml +++ b/layout/reftests/dom/xbl-children-4.xhtml @@ -15,15 +15,15 @@ /* First, schedule a pending restyle of the whole tree. */ var newSheet = document.createElementNS("http://www.w3.org/1999/xhtml", "style"); newSheet.appendChild(document.createTextNode("#nosuchelement { }")); 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 span = document.createElementNS("http://www.w3.org/1999/xhtml", "span"); - span.appendChild(document.createTextNode("PASS")); + span.appendChild(document.createTextNode("FAIL")); children.appendChild(span); document.documentElement.removeAttribute("class"); } </script> </body> </html>