From 1444801374bafb9a467a7ddeb214a9f92b311b80 Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Thu, 15 Mar 2012 13:26:35 +1100 Subject: [PATCH] typed arrays: unexport SizeOfArrayElementForType() It isn't used anywhere else, so made it an implementation detail in v8_typed_array.cc. --- src/v8_typed_array.cc | 44 +++++++++++++++++++++---------------------- src/v8_typed_array.h | 2 -- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/v8_typed_array.cc b/src/v8_typed_array.cc index 316abe2c03c0a1..3cf2db00afdb83 100644 --- a/src/v8_typed_array.cc +++ b/src/v8_typed_array.cc @@ -33,6 +33,25 @@ using node::ThrowRangeError; using node::ThrowTypeError; using node::ThrowError; +int SizeOfArrayElementForType(v8::ExternalArrayType type) { + switch (type) { + case v8::kExternalByteArray: + case v8::kExternalUnsignedByteArray: + return 1; + case v8::kExternalShortArray: + case v8::kExternalUnsignedShortArray: + return 2; + case v8::kExternalIntArray: + case v8::kExternalUnsignedIntArray: + case v8::kExternalFloatArray: + return 4; + case v8::kExternalDoubleArray: + return 8; + default: + return 0; + } +} + struct BatchedMethods { const char* name; v8::Handle (*func)(const v8::Arguments& args); @@ -64,7 +83,7 @@ class ArrayBuffer { v8::Object* obj = v8::Object::Cast(*value); void* ptr = obj->GetIndexedPropertiesExternalArrayData(); - int element_size = v8_typed_array::SizeOfArrayElementForType( + int element_size = SizeOfArrayElementForType( obj->GetIndexedPropertiesExternalArrayDataType()); int size = obj->GetIndexedPropertiesExternalArrayDataLength() * element_size; @@ -699,7 +718,7 @@ class DataView { unsigned int index = args[0]->Uint32Value(); bool little_endian = args[1]->BooleanValue(); // TODO(deanm): All of these things should be cacheable. - int element_size = v8_typed_array::SizeOfArrayElementForType( + int element_size = SizeOfArrayElementForType( args.This()->GetIndexedPropertiesExternalArrayDataType()); int size = args.This()->GetIndexedPropertiesExternalArrayDataLength() * element_size; @@ -719,7 +738,7 @@ class DataView { unsigned int index = args[0]->Int32Value(); bool little_endian = args[2]->BooleanValue(); // TODO(deanm): All of these things should be cacheable. - int element_size = v8_typed_array::SizeOfArrayElementForType( + int element_size = SizeOfArrayElementForType( args.This()->GetIndexedPropertiesExternalArrayDataType()); int size = args.This()->GetIndexedPropertiesExternalArrayDataLength() * element_size; @@ -829,25 +848,6 @@ void AttachBindings(v8::Handle obj) { DataView::GetTemplate()->GetFunction()); } -int SizeOfArrayElementForType(v8::ExternalArrayType type) { - switch (type) { - case v8::kExternalByteArray: - case v8::kExternalUnsignedByteArray: - return 1; - case v8::kExternalShortArray: - case v8::kExternalUnsignedShortArray: - return 2; - case v8::kExternalIntArray: - case v8::kExternalUnsignedIntArray: - case v8::kExternalFloatArray: - return 4; - case v8::kExternalDoubleArray: - return 8; - default: - return 0; - } -} - } // namespace v8_typed_array NODE_MODULE(node_typed_array, v8_typed_array::AttachBindings) diff --git a/src/v8_typed_array.h b/src/v8_typed_array.h index dc518ccdd7a132..47b66945cf3de9 100644 --- a/src/v8_typed_array.h +++ b/src/v8_typed_array.h @@ -28,8 +28,6 @@ namespace v8_typed_array { void AttachBindings(v8::Handle obj); -int SizeOfArrayElementForType(v8::ExternalArrayType type); - } // namespace v8_typed_array #endif // V8_TYPED_ARRAY_H_