summaryrefslogtreecommitdiffstats
path: root/js/xpconnect/wrappers/XrayWrapper.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-03-19 09:21:55 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-03-19 09:23:23 +0100
commitfaa5f0df26e09d1f2e633618476294d112c24322 (patch)
treed9cc82bd54a71c51146924e975aef4861e67cd27 /js/xpconnect/wrappers/XrayWrapper.cpp
parent393ee744a8d44494a2a3750aec8e3e9845ecf780 (diff)
parent77e607426f03524bdaf06bfc6799f5e9273051b9 (diff)
downloadUXP-faa5f0df26e09d1f2e633618476294d112c24322.tar
UXP-faa5f0df26e09d1f2e633618476294d112c24322.tar.gz
UXP-faa5f0df26e09d1f2e633618476294d112c24322.tar.lz
UXP-faa5f0df26e09d1f2e633618476294d112c24322.tar.xz
UXP-faa5f0df26e09d1f2e633618476294d112c24322.zip
Prototypes should be regular objects.
This resolves #76 Merged remote-tracking branch 'janek/js_error_ordinary-object_1'
Diffstat (limited to 'js/xpconnect/wrappers/XrayWrapper.cpp')
-rw-r--r--js/xpconnect/wrappers/XrayWrapper.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 5e537692d..8011d207f 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -636,14 +636,6 @@ JSXrayTraits::resolveOwnProperty(JSContext* cx, const Wrapper& jsWrapper,
return true;
}
- // Handle the 'name' property for error prototypes.
- if (IsErrorObjectKey(key) && id == GetJSIDByIndex(cx, XPCJSContext::IDX_NAME)) {
- RootedId className(cx);
- ProtoKeyToId(cx, key, &className);
- FillPropertyDescriptor(desc, wrapper, 0, UndefinedValue());
- return JS_IdToValue(cx, className, desc.value());
- }
-
// Handle the 'lastIndex' property for RegExp prototypes.
if (key == JSProto_RegExp && id == GetJSIDByIndex(cx, XPCJSContext::IDX_LASTINDEX))
return getOwnPropertyFromWrapperIfSafe(cx, wrapper, id, desc);
@@ -889,10 +881,6 @@ JSXrayTraits::enumerateNames(JSContext* cx, HandleObject wrapper, unsigned flags
if (!props.append(GetJSIDByIndex(cx, XPCJSContext::IDX_CONSTRUCTOR)))
return false;
- // For Error protoypes, add the 'name' property.
- if (IsErrorObjectKey(key) && !props.append(GetJSIDByIndex(cx, XPCJSContext::IDX_NAME)))
- return false;
-
// For RegExp protoypes, add the 'lastIndex' property.
if (key == JSProto_RegExp && !props.append(GetJSIDByIndex(cx, XPCJSContext::IDX_LASTINDEX)))
return false;