Index: src/api.cc |
diff --git a/src/api.cc b/src/api.cc |
index da510ad4fd3b5d707817a98d3426382036ab6130..39a1c0dfd512146aed2bfa2ea92fd9b072b70d28 100644 |
--- a/src/api.cc |
+++ b/src/api.cc |
@@ -3048,9 +3048,9 @@ void v8::Promise::Resolver::CheckCast(Value* that) { |
void v8::ArrayBuffer::CheckCast(Value* that) { |
i::Handle<i::Object> obj = Utils::OpenHandle(that); |
- Utils::ApiCheck(obj->IsJSArrayBuffer(), |
- "v8::ArrayBuffer::Cast()", |
- "Could not convert to ArrayBuffer"); |
+ Utils::ApiCheck( |
+ obj->IsJSArrayBuffer() && !i::JSArrayBuffer::cast(*obj)->is_shared(), |
+ "v8::ArrayBuffer::Cast()", "Could not convert to ArrayBuffer"); |
} |
@@ -3064,20 +3064,20 @@ void v8::ArrayBufferView::CheckCast(Value* that) { |
void v8::TypedArray::CheckCast(Value* that) { |
i::Handle<i::Object> obj = Utils::OpenHandle(that); |
- Utils::ApiCheck(obj->IsJSTypedArray(), |
- "v8::TypedArray::Cast()", |
- "Could not convert to TypedArray"); |
+ Utils::ApiCheck( |
+ obj->IsJSTypedArray() && !i::JSTypedArray::cast(*obj)->is_shared(), |
+ "v8::TypedArray::Cast()", "Could not convert to TypedArray"); |
} |
#define CHECK_TYPED_ARRAY_CAST(Type, typeName, TYPE, ctype, size) \ |
void v8::Type##Array::CheckCast(Value* that) { \ |
i::Handle<i::Object> obj = Utils::OpenHandle(that); \ |
- Utils::ApiCheck(obj->IsJSTypedArray() && \ |
- i::JSTypedArray::cast(*obj)->type() == \ |
- kExternal##Type##Array, \ |
- "v8::" #Type "Array::Cast()", \ |
- "Could not convert to " #Type "Array"); \ |
+ Utils::ApiCheck( \ |
+ obj->IsJSTypedArray() && \ |
+ i::JSTypedArray::cast(*obj)->type() == kExternal##Type##Array && \ |
+ !i::JSTypedArray::cast(*obj)->is_shared(), \ |
+ "v8::" #Type "Array::Cast()", "Could not convert to " #Type "Array"); \ |
} |
@@ -3094,6 +3094,40 @@ void v8::DataView::CheckCast(Value* that) { |
} |
+void v8::SharedArrayBuffer::CheckCast(Value* that) { |
+ i::Handle<i::Object> obj = Utils::OpenHandle(that); |
+ Utils::ApiCheck( |
+ obj->IsJSArrayBuffer() && i::JSArrayBuffer::cast(*obj)->is_shared(), |
+ "v8::SharedArrayBuffer::Cast()", |
+ "Could not convert to SharedArrayBuffer"); |
+} |
+ |
+ |
+void v8::SharedTypedArray::CheckCast(Value* that) { |
+ i::Handle<i::Object> obj = Utils::OpenHandle(that); |
+ Utils::ApiCheck( |
+ obj->IsJSTypedArray() && i::JSTypedArray::cast(*obj)->is_shared(), |
+ "v8::SharedTypedArray::Cast()", "Could not convert to SharedTypedArray"); |
+} |
+ |
+ |
+#define CHECK_SHARED_TYPED_ARRAY_CAST(Type, typeName, TYPE, ctype, size) \ |
+ void v8::Shared##Type##Array::CheckCast(Value* that) { \ |
+ i::Handle<i::Object> obj = Utils::OpenHandle(that); \ |
+ Utils::ApiCheck( \ |
+ obj->IsJSTypedArray() && \ |
+ i::JSTypedArray::cast(*obj)->type() == kExternal##Type##Array && \ |
+ i::JSTypedArray::cast(*obj)->is_shared(), \ |
+ "v8::Shared" #Type "Array::Cast()", \ |
+ "Could not convert to Shared" #Type "Array"); \ |
+ } |
+ |
+ |
+TYPED_ARRAYS(CHECK_SHARED_TYPED_ARRAY_CAST) |
+ |
+#undef CHECK_SHARED_TYPED_ARRAY_CAST |
+ |
+ |
void v8::Date::CheckCast(v8::Value* that) { |
i::Handle<i::Object> obj = Utils::OpenHandle(that); |
i::Isolate* isolate = NULL; |
@@ -5428,6 +5462,15 @@ void v8::V8::SetArrayBufferAllocator( |
i::V8::SetArrayBufferAllocator(allocator); |
} |
+void v8::V8::SetSharedArrayBufferAllocator( |
+ SharedArrayBuffer::Allocator* allocator) { |
+ if (!Utils::ApiCheck(i::V8::SharedArrayBufferAllocator() == NULL, |
+ "v8::V8::SetSharedArrayBufferAllocator", |
+ "SharedArrayBufferAllocator might only be set once")) |
+ return; |
+ i::V8::SetSharedArrayBufferAllocator(allocator); |
+} |
+ |
bool v8::V8::Dispose() { |
i::V8::TearDown(); |
@@ -6388,7 +6431,7 @@ Local<ArrayBuffer> v8::ArrayBuffer::New(Isolate* isolate, size_t byte_length) { |
LOG_API(i_isolate, "v8::ArrayBuffer::New(size_t)"); |
ENTER_V8(i_isolate); |
i::Handle<i::JSArrayBuffer> obj = |
- i_isolate->factory()->NewJSArrayBuffer(); |
+ i_isolate->factory()->NewJSArrayBuffer(false); |
i::Runtime::SetupArrayBufferAllocatingData(i_isolate, obj, byte_length); |
return Utils::ToLocal(obj); |
} |
@@ -6400,7 +6443,7 @@ Local<ArrayBuffer> v8::ArrayBuffer::New(Isolate* isolate, void* data, |
LOG_API(i_isolate, "v8::ArrayBuffer::New(void*, size_t)"); |
ENTER_V8(i_isolate); |
i::Handle<i::JSArrayBuffer> obj = |
- i_isolate->factory()->NewJSArrayBuffer(); |
+ i_isolate->factory()->NewJSArrayBuffer(false); |
i::Runtime::SetupArrayBuffer(i_isolate, obj, true, data, byte_length); |
return Utils::ToLocal(obj); |
} |
@@ -6487,7 +6530,7 @@ size_t v8::TypedArray::Length() { |
} \ |
i::Handle<i::JSArrayBuffer> buffer = Utils::OpenHandle(*array_buffer); \ |
i::Handle<i::JSTypedArray> obj = isolate->factory()->NewJSTypedArray( \ |
- v8::kExternal##Type##Array, buffer, byte_offset, length); \ |
+ v8::kExternal##Type##Array, buffer, byte_offset, length, false); \ |
return Utils::ToLocal##Type##Array(obj); \ |
} |
@@ -6507,6 +6550,107 @@ Local<DataView> DataView::New(Handle<ArrayBuffer> array_buffer, |
} |
+bool v8::SharedArrayBuffer::IsExternal() const { |
+ return Utils::OpenHandle(this)->is_external(); |
+} |
+ |
+ |
+v8::SharedArrayBuffer::Contents v8::SharedArrayBuffer::Externalize() { |
+ i::Handle<i::JSArrayBuffer> obj = Utils::OpenHandle(this); |
+ Utils::ApiCheck(!obj->is_external(), "v8::SharedArrayBuffer::Externalize", |
+ "SharedArrayBuffer already externalized"); |
+ obj->set_is_external(true); |
+ size_t byte_length = static_cast<size_t>(obj->byte_length()->Number()); |
+ Contents contents; |
+ contents.data_ = obj->backing_store(); |
+ contents.byte_length_ = byte_length; |
+ return contents; |
+} |
+ |
+ |
+size_t v8::SharedArrayBuffer::ByteLength() const { |
+ i::Handle<i::JSArrayBuffer> obj = Utils::OpenHandle(this); |
+ return static_cast<size_t>(obj->byte_length()->Number()); |
+} |
+ |
+ |
+Local<SharedArrayBuffer> v8::SharedArrayBuffer::New(Isolate* isolate, |
+ size_t byte_length) { |
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); |
+ LOG_API(i_isolate, "v8::SharedArrayBuffer::New(size_t)"); |
+ ENTER_V8(i_isolate); |
+ i::Handle<i::JSArrayBuffer> obj = |
+ i_isolate->factory()->NewJSArrayBuffer(true); |
+ i::Runtime::SetupArrayBufferAllocatingData(i_isolate, obj, byte_length, true, |
+ true); |
+ return Utils::ToLocalShared(obj); |
+} |
+ |
+ |
+Local<SharedArrayBuffer> v8::SharedArrayBuffer::New(Isolate* isolate, |
+ void* data, |
+ size_t byte_length) { |
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); |
+ LOG_API(i_isolate, "v8::SharedArrayBuffer::New(void*, size_t)"); |
+ ENTER_V8(i_isolate); |
+ i::Handle<i::JSArrayBuffer> obj = |
+ i_isolate->factory()->NewJSArrayBuffer(true); |
+ i::Runtime::SetupArrayBuffer(i_isolate, obj, true, data, byte_length, true); |
+ return Utils::ToLocalShared(obj); |
+} |
+ |
+ |
+Local<SharedArrayBuffer> v8::SharedTypedArray::Buffer() { |
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this); |
+ i::Handle<i::JSArrayBuffer> buffer = i::JSTypedArray::cast(*obj)->GetBuffer(); |
+ return Utils::ToLocalShared(buffer); |
+} |
+ |
+ |
+size_t v8::SharedTypedArray::ByteOffset() { |
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this); |
+ return static_cast<size_t>(obj->byte_offset()->Number()); |
+} |
+ |
+ |
+size_t v8::SharedTypedArray::ByteLength() { |
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this); |
+ return static_cast<size_t>(obj->byte_length()->Number()); |
+} |
+ |
+ |
+size_t v8::SharedTypedArray::Length() { |
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this); |
+ return static_cast<size_t>(obj->length()->Number()); |
+} |
+ |
+ |
+#define SHARED_TYPED_ARRAY_NEW(Type, type, TYPE, ctype, size) \ |
+ Local<Shared##Type##Array> Shared##Type##Array::New( \ |
+ Handle<SharedArrayBuffer> array_buffer, size_t byte_offset, \ |
+ size_t length) { \ |
+ i::Isolate* isolate = Utils::OpenHandle(*array_buffer)->GetIsolate(); \ |
+ LOG_API(isolate, "v8::Shared" #Type \ |
+ "Array::New(Handle<SharedArrayBuffer>, size_t, size_t)"); \ |
+ ENTER_V8(isolate); \ |
+ if (!Utils::ApiCheck( \ |
+ length <= static_cast<size_t>(i::Smi::kMaxValue), \ |
+ "v8::Shared" #Type \ |
+ "Array::New(Handle<SharedArrayBuffer>, size_t, size_t)", \ |
+ "length exceeds max allowed value")) { \ |
+ return Local<Shared##Type##Array>(); \ |
+ } \ |
+ i::Handle<i::JSArrayBuffer> buffer = Utils::OpenHandle(*array_buffer); \ |
+ i::Handle<i::JSTypedArray> obj = isolate->factory()->NewJSTypedArray( \ |
+ v8::kExternal##Type##Array, buffer, byte_offset, length, true); \ |
+ return Utils::ToLocalShared##Type##Array(obj); \ |
+ } |
+ |
+ |
+TYPED_ARRAYS(SHARED_TYPED_ARRAY_NEW) |
+#undef SHARED_TYPED_ARRAY_NEW |
+ |
+ |
Local<Symbol> v8::Symbol::New(Isolate* isolate, Local<String> name) { |
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); |
LOG_API(i_isolate, "Symbol::New()"); |