diff options
author | Ben Murdoch <benm@google.com> | 2011-11-30 16:04:58 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:30 +0000 |
commit | 589d6979ff2ef66fca2d8fa51404c369ca5e9250 (patch) | |
tree | 1d9032fcae9d18a05430a4ba9c14e5c635c4096e /src/property.h | |
parent | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (diff) | |
download | android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.gz android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.bz2 android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.zip |
Upgrade to V8 3.6
Merge V8 at 3.6.6.11
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77
Diffstat (limited to 'src/property.h')
-rw-r--r-- | src/property.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/property.h b/src/property.h index ddecc921..e7d9fc53 100644 --- a/src/property.h +++ b/src/property.h @@ -1,4 +1,4 @@ -// Copyright 2006-2008 the V8 project authors. All rights reserved. +// Copyright 2011 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: @@ -112,14 +112,14 @@ class MapTransitionDescriptor: public Descriptor { : Descriptor(key, map, attributes, MAP_TRANSITION) { } }; -class ExternalArrayTransitionDescriptor: public Descriptor { +class ElementsTransitionDescriptor: public Descriptor { public: - ExternalArrayTransitionDescriptor(String* key, - Map* map, - ExternalArrayType array_type) + ElementsTransitionDescriptor(String* key, + Map* map, + ElementsKind elements_kind) : Descriptor(key, map, PropertyDetails(NONE, - EXTERNAL_ARRAY_TRANSITION, - array_type)) { } + ELEMENTS_TRANSITION, + elements_kind)) { } }; // Marks a field name in a map so that adding the field is guaranteed @@ -281,7 +281,7 @@ class LookupResult BASE_EMBEDDED { Map* GetTransitionMap() { ASSERT(lookup_type_ == DESCRIPTOR_TYPE); ASSERT(type() == MAP_TRANSITION || type() == CONSTANT_TRANSITION || - type() == EXTERNAL_ARRAY_TRANSITION); + type() == ELEMENTS_TRANSITION); return Map::cast(GetValue()); } |