Chromium Code Reviews| Index: runtime/vm/object.h |
| =================================================================== |
| --- runtime/vm/object.h (revision 25742) |
| +++ runtime/vm/object.h (working copy) |
| @@ -5349,7 +5349,7 @@ |
| } |
| - TypeDataElementType ElementType() const { |
| + TypedDataElementType ElementType() const { |
|
zra
2013/08/02 21:22:22
Is this renaming related to the Random fix?
|
| intptr_t cid = raw()->GetClassId(); |
| return ElementType(cid); |
| } |
| @@ -5383,6 +5383,8 @@ |
| TYPED_GETTER_SETTER(Float64, double) |
| TYPED_GETTER_SETTER(Float32x4, simd128_value_t) |
| +#undef TYPED_GETTER_SETTER |
| + |
| static intptr_t length_offset() { |
| return OFFSET_OF(RawTypedData, length_); |
| } |
| @@ -5406,9 +5408,9 @@ |
| return element_size[ElementType(class_id)]; |
| } |
| - static TypeDataElementType ElementType(intptr_t class_id) { |
| + static TypedDataElementType ElementType(intptr_t class_id) { |
| ASSERT(RawObject::IsTypedDataClassId(class_id)); |
| - return static_cast<TypeDataElementType>( |
| + return static_cast<TypedDataElementType>( |
| class_id - kTypedDataInt8ArrayCid); |
| } |
| @@ -5475,7 +5477,7 @@ |
| return ElementSizeInBytes(cid); |
| } |
| - TypeDataElementType ElementType() const { |
| + TypedDataElementType ElementType() const { |
| intptr_t cid = raw()->GetClassId(); |
| return ElementType(cid); |
| } |
| @@ -5513,6 +5515,8 @@ |
| TYPED_GETTER_SETTER(Float64, double) |
| TYPED_GETTER_SETTER(Float32x4, simd128_value_t); |
| +#undef TYPED_GETTER_SETTER |
| + |
| FinalizablePersistentHandle* AddFinalizer( |
| void* peer, Dart_WeakPersistentHandleFinalizer callback) const; |
| @@ -5533,9 +5537,9 @@ |
| return TypedData::element_size[ElementType(class_id)]; |
| } |
| - static TypeDataElementType ElementType(intptr_t class_id) { |
| + static TypedDataElementType ElementType(intptr_t class_id) { |
| ASSERT(RawObject::IsExternalTypedDataClassId(class_id)); |
| - return static_cast<TypeDataElementType>( |
| + return static_cast<TypedDataElementType>( |
| class_id - kExternalTypedDataInt8ArrayCid); |
| } |