Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(675)

Unified Diff: Source/core/dom/DOMTypedArray.cpp

Issue 1097773004: Sharing of SharedArrayBuffer via PostMessage transfer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: . Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/DOMTypedArray.cpp
diff --git a/Source/core/dom/DOMTypedArray.cpp b/Source/core/dom/DOMTypedArray.cpp
index c5d5e327d018c255fc63682c4ee9b7566ddf929b..83a76b8154a169c68a7d9c504168f587174241eb 100644
--- a/Source/core/dom/DOMTypedArray.cpp
+++ b/Source/core/dom/DOMTypedArray.cpp
@@ -31,13 +31,18 @@ v8::Local<v8::Object> DOMTypedArray<WTFTypedArray, V8TypedArray>::wrap(v8::Isola
ASSERT(!DOMDataStore::containsWrapper(this, isolate));
const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo();
- RefPtr<DOMArrayBuffer> buffer = this->buffer();
+ RefPtr<DOMArrayBufferBase> buffer = this->bufferBase();
v8::Local<v8::Value> v8Buffer = toV8(buffer.get(), creationContext, isolate);
if (v8Buffer.IsEmpty())
- return v8::Handle<v8::Object>();
- ASSERT(v8Buffer->IsArrayBuffer());
+ return v8::Local<v8::Object>();
+ ASSERT(isShared() == v8Buffer->IsSharedArrayBuffer());
- v8::Local<v8::Object> wrapper = V8TypedArray::New(v8Buffer.As<v8::ArrayBuffer>(), byteOffset(), length());
+ v8::Local<v8::Object> wrapper;
+ if (isShared()) {
+ wrapper = V8TypedArray::New(v8Buffer.As<v8::ArrayBuffer>(), byteOffset(), length());
+ } else {
+ wrapper = V8TypedArray::New(v8Buffer.As<v8::SharedArrayBuffer>(), byteOffset(), length());
haraken 2015/06/11 05:59:29 Is this correct? You are casting a non-shared buff
+ }
return associateWithWrapper(isolate, wrapperTypeInfo, wrapper);
}

Powered by Google App Engine
This is Rietveld 408576698