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 969030 - Remove support for calling document.all; r=bz

Browse Source
This commit is contained in:
Ms2ger 2014-02-09 09:04:40 +01:00
parent 1f86cbc23f
commit 923912957b
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/html/document/src/HTMLAllCollection.cpp
View File

@ -37,11 +37,10 @@ const JSClass sHTMLDocumentAllClass = {
JS_DeletePropertyStub, /* delProperty */
nsHTMLDocumentSH::DocumentAllGetProperty, /* getProperty */
JS_StrictPropertyStub, /* setProperty */
JS_EnumerateStub,
(JSResolveOp)nsHTMLDocumentSH::DocumentAllNewResolve,
JS_ConvertStub,
nsHTMLDocumentSH::ReleaseDocument,
nsHTMLDocumentSH::CallToGetPropMapper
JS_EnumerateStub, /* enumerate */
(JSResolveOp)nsHTMLDocumentSH::DocumentAllNewResolve, /* resolve */
JS_ConvertStub, /* convert */
nsHTMLDocumentSH::ReleaseDocument /* finalize */
};
namespace mozilla {
@ -372,14 +371,12 @@ bool
nsHTMLDocumentSH::CallToGetPropMapper(JSContext *cx, unsigned argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
// Handle document.all("foo") style access to document.all.
if (args.length() != 1) {
// XXX: Should throw NS_ERROR_XPC_NOT_ENOUGH_ARGS for argc < 1,
// and create a new NS_ERROR_XPC_TOO_MANY_ARGS for argc > 1? IE
// accepts nothing other than one arg.
xpc::Throw(cx, NS_ERROR_INVALID_ARG);
return false;
}
@ -389,15 +386,8 @@ nsHTMLDocumentSH::CallToGetPropMapper(JSContext *cx, unsigned argc, jsval *vp)
return false;
}
// If we are called via document.all(id) instead of document.all.item(i) or
// another method, use the document.all callee object as self.
JS::Rooted<JSObject*> self(cx);
if (args.calleev().isObject() &&
JS_GetClass(&args.calleev().toObject()) == &sHTMLDocumentAllClass) {
self = &args.calleev().toObject();
} else {
self = JS_THIS_OBJECT(cx, vp);
if (!self)
JS::Rooted<JSObject*> self(cx, JS_THIS_OBJECT(cx, vp));
if (!self) {
return false;
}

2
dom/base/test/test_nondomexception.html
View File

@ -15,7 +15,7 @@
"use strict";
try {
document.all();
document.all.item();
} catch (e) {
is(typeof e, "object");
is(e.filename, location);