diff options
| author | win7-7 <win7-7@users.noreply.github.com> | 2019-06-30 12:38:18 +0300 |
|---|---|---|
| committer | win7-7 <win7-7@users.noreply.github.com> | 2019-06-30 12:38:18 +0300 |
| commit | 3051056bbb0b41b8258d91e44a4ff8ec33a98d8f (patch) | |
| tree | 435214f56383925b337cc350452485717c4ea0d1 /js/src/jsfriendapi.cpp | |
| parent | 00812e30dfa70f9b1a752cf0d09de00f6d401c85 (diff) | |
| parent | 98f7e3b16754aedd44747261113359b8d824449f (diff) | |
| download | UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.gz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.lz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.tar.xz UXP-3051056bbb0b41b8258d91e44a4ff8ec33a98d8f.zip | |
Merge branch 'master' into FrameProperties
Diffstat (limited to 'js/src/jsfriendapi.cpp')
| -rw-r--r-- | js/src/jsfriendapi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp index 1fd9d1d28..5baba0beb 100644 --- a/js/src/jsfriendapi.cpp +++ b/js/src/jsfriendapi.cpp @@ -269,7 +269,7 @@ js::GetBuiltinClass(JSContext* cx, HandleObject obj, ESClass* cls) if (MOZ_UNLIKELY(obj->is<ProxyObject>())) return Proxy::getBuiltinClass(cx, obj, cls); - if (obj->is<PlainObject>() || obj->is<UnboxedPlainObject>()) + if (obj->is<PlainObject>()) *cls = ESClass::Object; else if (obj->is<ArrayObject>()) *cls = ESClass::Array; |