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

Side by Side Diff: Source/core/dom/DOMArrayBuffer.cpp

Issue 1183763003: Remove ArrayBufferDeallocationObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: s_ prefix 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/DOMArrayBuffer.h ('k') | Source/core/dom/DOMArrayBufferDeallocationObserver.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/DOMArrayBuffer.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"
11 10
12 namespace blink { 11 namespace blink {
13 12
14 v8::Local<v8::Object> DOMArrayBuffer::wrap(v8::Isolate* isolate, v8::Local<v8::O bject> creationContext) 13 v8::Local<v8::Object> DOMArrayBuffer::wrap(v8::Isolate* isolate, v8::Local<v8::O bject> creationContext)
15 { 14 {
16 // It's possible that no one except for the new wrapper owns this object at 15 // 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 16 // this moment, so we have to prevent GC to collect this object until the
18 // object gets associated with the wrapper. 17 // object gets associated with the wrapper.
19 RefPtr<DOMArrayBuffer> protect(this); 18 RefPtr<DOMArrayBuffer> protect(this);
20 19
21 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); 20 ASSERT(!DOMDataStore::containsWrapper(this, isolate));
22 21
23 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); 22 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo();
24 v8::Local<v8::Object> wrapper = v8::ArrayBuffer::New(isolate, data(), byteLe ngth()); 23 v8::Local<v8::Object> wrapper = v8::ArrayBuffer::New(isolate, data(), byteLe ngth());
25 24
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
28 // setDeallocationObserver implicitly calls
29 // DOMArrayBufferDeallocationObserver::blinkAllocatedMemory.
30 buffer()->setDeallocationObserver(DOMArrayBufferDeallocationObserver::instan ce());
31
32 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); 25 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper);
33 } 26 }
34 27
35 v8::Local<v8::Object> DOMArrayBuffer::associateWithWrapper(v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) 28 v8::Local<v8::Object> DOMArrayBuffer::associateWithWrapper(v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper)
36 { 29 {
37 // This function does not set a deallocation observer to the underlying 30 // This function does not set a deallocation observer to the underlying
38 // array buffer. It's a caller's duty. 31 // array buffer. It's a caller's duty.
39 32
40 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); 33 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper);
41 } 34 }
42 35
43 } // namespace blink 36 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/DOMArrayBuffer.h ('k') | Source/core/dom/DOMArrayBufferDeallocationObserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698