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

Side by Side Diff: third_party/WebKit/Source/modules/webusb/USBInTransferResult.h

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+more tweaks Created 5 years, 1 month 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 USBInTransferResult_h 5 #ifndef USBInTransferResult_h
6 #define USBInTransferResult_h 6 #define USBInTransferResult_h
7 7
8 #include "bindings/core/v8/ScriptWrappable.h" 8 #include "bindings/core/v8/ScriptWrappable.h"
9 #include "core/dom/DOMArrayBuffer.h" 9 #include "core/dom/DOMArrayBuffer.h"
10 #include "platform/heap/Handle.h" 10 #include "platform/heap/Handle.h"
11 #include "public/platform/modules/webusb/WebUSBTransferInfo.h" 11 #include "public/platform/modules/webusb/WebUSBTransferInfo.h"
12 #include "wtf/text/WTFString.h" 12 #include "wtf/text/WTFString.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 class USBInTransferResult final 16 class USBInTransferResult final
17 : public GarbageCollectedFinalized<USBInTransferResult> 17 : public GarbageCollectedFinalized<USBInTransferResult>
18 , public ScriptWrappable { 18 , public ScriptWrappable {
19 DEFINE_WRAPPERTYPEINFO(); 19 DEFINE_WRAPPERTYPEINFO();
20 public: 20 public:
21 static USBInTransferResult* create(const String& status, const WebVector<uin t8_t> data) 21 static USBInTransferResult* create(const String& status, const WebVector<uin t8_t> data)
22 { 22 {
23 return new USBInTransferResult(status, data); 23 return new USBInTransferResult(status, data);
24 } 24 }
25 25
26 USBInTransferResult(const String& status, const WebVector<uint8_t> data) 26 USBInTransferResult(const String& status, const WebVector<uint8_t> data)
27 : m_status(status) 27 : m_status(status)
28 , m_data(DOMArrayBuffer::create(data.data(), data.size())) 28 , m_data(DOMArrayBuffer::deprecatedCreateOrCrash(data.data(), data.size( )))
29 { 29 {
30 } 30 }
31 31
32 virtual ~USBInTransferResult() { } 32 virtual ~USBInTransferResult() { }
33 33
34 String status() const { return m_status; } 34 String status() const { return m_status; }
35 PassRefPtr<DOMArrayBuffer> data() const { return m_data; } 35 PassRefPtr<DOMArrayBuffer> data() const { return m_data; }
36 36
37 DEFINE_INLINE_TRACE() { } 37 DEFINE_INLINE_TRACE() { }
38 38
39 private: 39 private:
40 const String m_status; 40 const String m_status;
41 const RefPtr<DOMArrayBuffer> m_data; 41 const RefPtr<DOMArrayBuffer> m_data;
42 }; 42 };
43 43
44 } // namespace blink 44 } // namespace blink
45 45
46 #endif // USBInTransferResult_h 46 #endif // USBInTransferResult_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698