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

Side by Side Diff: Source/wtf/ArrayBufferContents.h

Issue 1183763003: Remove ArrayBufferDeallocationObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move callback to WTF.cpp 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef ArrayBufferContents_h 27 #ifndef ArrayBufferContents_h
28 #define ArrayBufferContents_h 28 #define ArrayBufferContents_h
29 29
30 #include "wtf/ArrayBufferDeallocationObserver.h" 30 #include "wtf/Assertions.h"
31 #include "wtf/Noncopyable.h" 31 #include "wtf/Noncopyable.h"
32 #include "wtf/WTF.h"
32 #include "wtf/WTFExport.h" 33 #include "wtf/WTFExport.h"
33 34
34 namespace WTF { 35 namespace WTF {
35 36
36 class WTF_EXPORT ArrayBufferContents { 37 class WTF_EXPORT ArrayBufferContents {
37 WTF_MAKE_NONCOPYABLE(ArrayBufferContents); 38 WTF_MAKE_NONCOPYABLE(ArrayBufferContents);
38 public: 39 public:
39 enum InitializationPolicy { 40 enum InitializationPolicy {
40 ZeroInitialize, 41 ZeroInitialize,
41 DontInitialize 42 DontInitialize
42 }; 43 };
43 44
44 ArrayBufferContents(); 45 ArrayBufferContents();
45 ArrayBufferContents(unsigned numElements, unsigned elementByteSize, ArrayBuf ferContents::InitializationPolicy); 46 ArrayBufferContents(unsigned numElements, unsigned elementByteSize, ArrayBuf ferContents::InitializationPolicy);
46 47
47 // Use with care. data must be allocated with allocateMemory. 48 // Use with care. data must be allocated with allocateMemory.
48 // ArrayBufferContents will take ownership of the data and free it (using fr eeMemory) 49 // ArrayBufferContents will take ownership of the data and free it (using fr eeMemory)
49 // upon destruction. 50 // upon destruction.
50 // This constructor will not call observer->StartObserving(), so it is a res ponsibility 51 // This constructor will not call observer->StartObserving(), so it is a res ponsibility
51 // of the caller to make sure JS knows about external memory. 52 // of the caller to make sure JS knows about external memory.
52 ArrayBufferContents(void* data, unsigned sizeInBytes, ArrayBufferDeallocatio nObserver*); 53 ArrayBufferContents(void* data, unsigned sizeInBytes);
53 54
54 ~ArrayBufferContents(); 55 ~ArrayBufferContents();
55 56
56 void clear(); 57 void clear();
57 58
58 void* data() const { return m_data; } 59 void* data() const { return m_data; }
59 unsigned sizeInBytes() const { return m_sizeInBytes; } 60 unsigned sizeInBytes() const { return m_sizeInBytes; }
60 61
61 void setDeallocationObserver(ArrayBufferDeallocationObserver& observer)
62 {
63 if (!m_deallocationObserver) {
64 m_deallocationObserver = &observer;
65 m_deallocationObserver->blinkAllocatedMemory(m_sizeInBytes);
66 }
67 }
68 void setDeallocationObserverWithoutAllocationNotification(ArrayBufferDealloc ationObserver& observer)
69 {
70 if (!m_deallocationObserver) {
71 m_deallocationObserver = &observer;
72 }
73 }
74
75 void transfer(ArrayBufferContents& other); 62 void transfer(ArrayBufferContents& other);
76 void copyTo(ArrayBufferContents& other); 63 void copyTo(ArrayBufferContents& other);
77 64
78 static void allocateMemory(size_t, InitializationPolicy, void*&); 65 static void allocateMemory(size_t, InitializationPolicy, void*&);
79 static void freeMemory(void*, size_t); 66 static void freeMemory(void*, size_t);
67 static void setAllocationListener(ArrayBufferAllocationListenerFunction list ener)
68 {
69 ASSERT(!allocationListener);
70 allocationListener = listener;
71 }
80 72
81 private: 73 private:
82 void* m_data; 74 void* m_data;
83 unsigned m_sizeInBytes; 75 unsigned m_sizeInBytes;
84 ArrayBufferDeallocationObserver* m_deallocationObserver; 76 static ArrayBufferAllocationListenerFunction allocationListener;
85 }; 77 };
86 78
87 } // namespace WTF 79 } // namespace WTF
88 80
89 #endif // ArrayBufferContents_h 81 #endif // ArrayBufferContents_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698