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

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-07-20 20:19:31 -04:00
commit ef318bebea
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/xul/content/src/nsXULElement.cpp
View File

@ -377,7 +377,8 @@ nsXULElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
}
NS_ENSURE_SUCCESS(rv, rv);
element->AddListenerFor(*originalName, true);
if (originalName->Equals(nsGkAtoms::id)) {
if (originalName->Equals(nsGkAtoms::id) &&
!originalValue->IsEmptyString()) {
element->SetHasID();
}
if (originalName->Equals(nsGkAtoms::_class)) {

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

@ -20,6 +20,7 @@ MOCHITEST_CHROME_FILES = \
test_bug233643.xul \
test_bug398289.html \
398289-resource.xul \
test_bug775972.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

35
content/xul/content/test/test_bug775972.xul Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=775972
-->
<window title="Mozilla Bug 775972"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="test()">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=775972"
target="_blank">Mozilla Bug 775972</a>
</body>
<hbox id="container"><label value="test" id=""/></hbox>
<!-- test code goes here -->
<script type="application/javascript">
<![CDATA[
/** Test for Bug 775972 **/
function test() {
var c = document.getElementById("container");
var clone = c.cloneNode(true);
document.documentElement.appendChild(clone);
ok(true, "This shouldn't crash!");
}
]]>
</script>
</window>

2
testing/marionette/client/marionette/tests/unit/unit-tests.ini
View File

@ -14,6 +14,8 @@ b2g = false
[test_log.py]
[test_emulator.py]
browser = false
qemu = true
[test_execute_async_script.py]
[test_execute_script.py]
[test_simpletest_fail.js]