Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/dom/DOMArrayBuffer.h" | 6 #include "core/dom/DOMSharedArrayBuffer.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/DOMDataStore.h" | 8 #include "bindings/core/v8/DOMDataStore.h" |
| 9 #include "bindings/core/v8/V8DOMWrapper.h" | 9 #include "bindings/core/v8/V8DOMWrapper.h" |
| 10 #include "core/dom/DOMArrayBufferDeallocationObserver.h" | 10 #include "core/dom/DOMArrayBufferDeallocationObserver.h" |
| 11 | 11 |
| 12 namespace blink { | 12 namespace blink { |
| 13 | 13 |
| 14 v8::Local<v8::Object> DOMArrayBuffer::wrap(v8::Isolate* isolate, v8::Local<v8::O bject> creationContext) | 14 v8::Handle<v8::Object> DOMSharedArrayBuffer::wrap(v8::Isolate* isolate, v8::Hand le<v8::Object> creationContext) |
|
Yuki
2015/06/09 06:18:07
v8::Handle is obsolete. Please use v8::Local.
binji
2015/06/10 06:04:38
Done.
| |
| 15 { | 15 { |
| 16 // It's possible that no one except for the new wrapper owns this object at | 16 // It's possible that no one except for the new wrapper owns this object at |
| 17 // this moment, so we have to prevent GC to collect this object until the | 17 // this moment, so we have to prevent GC to collect this object until the |
| 18 // object gets associated with the wrapper. | 18 // object gets associated with the wrapper. |
| 19 RefPtr<DOMArrayBuffer> protect(this); | 19 RefPtr<DOMSharedArrayBuffer> protect(this); |
| 20 | 20 |
| 21 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); | 21 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); |
| 22 | 22 |
| 23 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); | 23 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); |
| 24 v8::Local<v8::Object> wrapper = v8::ArrayBuffer::New(isolate, data(), byteLe ngth()); | 24 v8::Handle<v8::Object> wrapper = v8::SharedArrayBuffer::New(isolate, data(), byteLength()); |
| 25 | 25 |
| 26 // Only when we create a new wrapper, let V8 know that we allocated and | 26 // Only when we create a new wrapper, let V8 know that we allocated and |
| 27 // associated a new memory block with the wrapper. Note that | 27 // associated a new memory block with the wrapper. Note that |
| 28 // setDeallocationObserver implicitly calls | 28 // setDeallocationObserver implicitly calls |
| 29 // DOMArrayBufferDeallocationObserver::blinkAllocatedMemory. | 29 // DOMArrayBufferDeallocationObserver::blinkAllocatedMemory. |
| 30 // TODO(binji): Should this be a different observer? Perhaps we want to trac k shared memory separately. | |
| 30 buffer()->setDeallocationObserver(DOMArrayBufferDeallocationObserver::instan ce()); | 31 buffer()->setDeallocationObserver(DOMArrayBufferDeallocationObserver::instan ce()); |
| 31 | 32 |
| 32 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); | 33 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); |
| 33 } | 34 } |
| 34 | 35 |
| 35 v8::Local<v8::Object> DOMArrayBuffer::associateWithWrapper(v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) | 36 v8::Handle<v8::Object> DOMSharedArrayBuffer::associateWithWrapper(v8::Isolate* i solate, const WrapperTypeInfo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper) |
| 36 { | 37 { |
| 37 // This function does not set a deallocation observer to the underlying | 38 // This function does not set a deallocation observer to the underlying |
| 38 // array buffer. It's a caller's duty. | 39 // array buffer. It's a caller's duty. |
| 39 | 40 |
| 40 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); | 41 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); |
| 41 } | 42 } |
| 42 | 43 |
| 43 } // namespace blink | 44 } // namespace blink |
| OLD | NEW |