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

Side by Side Diff: third_party/WebKit/Source/core/dom/DOMArrayBuffer.h

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 // 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 #ifndef DOMArrayBuffer_h 5 #ifndef DOMArrayBuffer_h
6 #define DOMArrayBuffer_h 6 #define DOMArrayBuffer_h
7 7
8 #include "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "core/dom/DOMArrayBufferBase.h" 9 #include "core/dom/DOMArrayBufferBase.h"
10 #include "wtf/ArrayBuffer.h" 10 #include "wtf/ArrayBuffer.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase { 14 class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase {
15 DEFINE_WRAPPERTYPEINFO(); 15 DEFINE_WRAPPERTYPEINFO();
16 public: 16 public:
17 static PassRefPtr<DOMArrayBuffer> create(PassRefPtr<WTF::ArrayBuffer> buffer ) 17 static PassRefPtr<DOMArrayBuffer> createOrNull(PassRefPtr<WTF::ArrayBuffer> buffer)
18 { 18 {
19 if (!buffer)
20 return nullptr;
19 return adoptRef(new DOMArrayBuffer(buffer)); 21 return adoptRef(new DOMArrayBuffer(buffer));
20 } 22 }
21 static PassRefPtr<DOMArrayBuffer> create(unsigned numElements, unsigned elem entByteSize) 23 static PassRefPtr<DOMArrayBuffer> createOrNull(unsigned numElements, unsigne d elementByteSize)
22 { 24 {
23 return create(WTF::ArrayBuffer::create(numElements, elementByteSize)); 25 return createOrNull(WTF::ArrayBuffer::createOrNull(numElements, elementB yteSize));
24 } 26 }
25 static PassRefPtr<DOMArrayBuffer> create(const void* source, unsigned byteLe ngth) 27 static PassRefPtr<DOMArrayBuffer> createOrNull(const void* source, unsigned byteLength)
26 { 28 {
27 return create(WTF::ArrayBuffer::create(source, byteLength)); 29 return createOrNull(WTF::ArrayBuffer::createOrNull(source, byteLength));
30 }
31 static PassRefPtr<DOMArrayBuffer> deprecatedCreateOrCrash(const void* source , unsigned byteLength)
32 {
33 return create(WTF::ArrayBuffer::deprecatedCreateOrCrash(source, byteLeng th));
34 }
35 static PassRefPtr<DOMArrayBuffer> deprecatedCreateOrCrash(unsigned numElemen ts, unsigned elementByteSize)
36 {
37 return create(WTF::ArrayBuffer::deprecatedCreateOrCrash(numElements, ele mentByteSize));
28 } 38 }
29 static PassRefPtr<DOMArrayBuffer> create(WTF::ArrayBufferContents& contents) 39 static PassRefPtr<DOMArrayBuffer> create(WTF::ArrayBufferContents& contents)
binji 2015/10/16 22:12:39 it almost feels like these functions that don't al
Justin Novosad 2015/10/19 16:42:52 They still construct a DOMArrayBuffer object. So "
30 { 40 {
31 return create(WTF::ArrayBuffer::create(contents)); 41 return adoptRef(new DOMArrayBuffer(WTF::ArrayBuffer::create(contents)));
42 }
43 static PassRefPtr<DOMArrayBuffer> create(PassRefPtr<WTF::ArrayBuffer> buffer )
44 {
45 ASSERT(buffer);
46 return adoptRef(new DOMArrayBuffer(buffer));
47 }
48 // Only for use by XMLHttpRequest::responseArrayBuffer and
49 // Internals::serializeObject.
50 static PassRefPtr<DOMArrayBuffer> createUninitializedOrNull(unsigned numElem ents, unsigned elementByteSize)
51 {
52 return createOrNull(WTF::ArrayBuffer::createUninitializedOrNull(numEleme nts, elementByteSize));
32 } 53 }
33 54
34 // Only for use by XMLHttpRequest::responseArrayBuffer and 55 PassRefPtr<DOMArrayBuffer> sliceOrNull(int begin, int end) const
35 // Internals::serializeObject.
36 static PassRefPtr<DOMArrayBuffer> createUninitialized(unsigned numElements, unsigned elementByteSize)
37 { 56 {
38 return create(WTF::ArrayBuffer::createUninitialized(numElements, element ByteSize)); 57 return createOrNull(buffer()->sliceOrNull(begin, end));
39 } 58 }
40 59 PassRefPtr<DOMArrayBuffer> sliceOrNull(int begin) const
41 PassRefPtr<DOMArrayBuffer> slice(int begin, int end) const
42 { 60 {
43 return create(buffer()->slice(begin, end)); 61 return createOrNull(buffer()->sliceOrNull(begin));
44 }
45 PassRefPtr<DOMArrayBuffer> slice(int begin) const
46 {
47 return create(buffer()->slice(begin));
48 } 62 }
49 63
50 v8::Local<v8::Object> wrap(v8::Isolate*, v8::Local<v8::Object> creationConte xt) override; 64 v8::Local<v8::Object> wrap(v8::Isolate*, v8::Local<v8::Object> creationConte xt) override;
51 65
52 private: 66 private:
53 explicit DOMArrayBuffer(PassRefPtr<WTF::ArrayBuffer> buffer) 67 explicit DOMArrayBuffer(PassRefPtr<WTF::ArrayBuffer> buffer)
54 : DOMArrayBufferBase(buffer) 68 : DOMArrayBufferBase(buffer)
55 { 69 {
56 } 70 }
57 }; 71 };
58 72
59 } // namespace blink 73 } // namespace blink
60 74
61 #endif // DOMArrayBuffer_h 75 #endif // DOMArrayBuffer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698