diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:04:57 +0000 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:04:57 +0000 |
commit | acb89c461f3b3bab4ef2a3a922db595f248e59ae (patch) | |
tree | ddf737a6c76e6d7ae1c3ee23c9cb93713ff36256 | |
parent | 6f2b68ab11d564d25eeba36b6e8bdb44ab5b1ba4 (diff) | |
parent | f53dc205fc8ac4f3e92cb554eb15ef0588667a4b (diff) | |
download | android_external_v8-cm-11.0.tar.gz android_external_v8-cm-11.0.tar.bz2 android_external_v8-cm-11.0.zip |
Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0
Android 4.4 Release 1.0
-rw-r--r-- | src/objects.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/objects.cc b/src/objects.cc index 904cf524..a30641b9 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -10102,6 +10102,13 @@ bool JSObject::HasRealElementProperty(uint32_t index) { } } + if (IsJSGlobalProxy()) { + Object* proto = GetPrototype(); + if (proto->IsNull()) return false; + ASSERT(proto->IsJSGlobalObject()); + return JSObject::cast(proto)->HasRealElementProperty(index); + } + // Handle [] on String objects. if (this->IsStringObjectWithCharacterAt(index)) return true; |