Merge backout of changeset 6346e45d7034

This commit is contained in:
Blake Kaplan 2010-06-23 17:18:19 -05:00
commit 471d3b5123
3 changed files with 1 additions and 35 deletions

View File

@ -8021,7 +8021,7 @@ nsGenericArraySH::Enumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
jsval len_val;
JSAutoRequest ar(cx);
JSBool ok = JS_LookupProperty(cx, obj, "length", &len_val);
JSBool ok = ::JS_GetProperty(cx, obj, "length", &len_val);
if (ok && JSVAL_IS_INT(len_val)) {
PRInt32 length = JSVAL_TO_INT(len_val);

View File

@ -116,7 +116,6 @@ _TEST_FILES = \
test_bug563487.html \
test_bug545314.html \
test_bug548828.html \
test_bug564208.html \
test_DOMWindowCreated_chromeonly.html \
$(NULL)

View File

@ -1,33 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=564208
-->
<head>
<title>Test for Bug 564208</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/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=564208">Mozilla Bug 564208</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 564208 **/
var sawLength = false;
var c = document.childNodes;
c.__proto__ = document.createTextNode(" ");
for (var i in c) { if (i === "length") sawLength = true; }
ok(sawLength, "property enumerated length");
</script>
</pre>
</body>
</html>