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

Side by Side Diff: third_party/WebKit/Source/wtf/Uint16Array.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 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 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
(...skipping 17 matching lines...) Expand all
28 #define Uint16Array_h 28 #define Uint16Array_h
29 29
30 #include "wtf/IntegralTypedArrayBase.h" 30 #include "wtf/IntegralTypedArrayBase.h"
31 31
32 namespace WTF { 32 namespace WTF {
33 33
34 class ArrayBuffer; 34 class ArrayBuffer;
35 35
36 class Uint16Array final : public IntegralTypedArrayBase<unsigned short> { 36 class Uint16Array final : public IntegralTypedArrayBase<unsigned short> {
37 public: 37 public:
38 static inline PassRefPtr<Uint16Array> create(unsigned length); 38 static inline PassRefPtr<Uint16Array> createOrNull(unsigned length);
39 static inline PassRefPtr<Uint16Array> create(const unsigned short* array, un signed length); 39 static inline PassRefPtr<Uint16Array> createOrNull(const unsigned short* arr ay, unsigned length);
40 static inline PassRefPtr<Uint16Array> deprecatedCreateOrCrash(const unsigned short* array, unsigned length);
40 static inline PassRefPtr<Uint16Array> create(PassRefPtr<ArrayBuffer>, unsign ed byteOffset, unsigned length); 41 static inline PassRefPtr<Uint16Array> create(PassRefPtr<ArrayBuffer>, unsign ed byteOffset, unsigned length);
41 42
42 using TypedArrayBase<unsigned short>::set; 43 using TypedArrayBase<unsigned short>::set;
43 using IntegralTypedArrayBase<unsigned short>::set; 44 using IntegralTypedArrayBase<unsigned short>::set;
44 45
45 ViewType type() const override 46 ViewType type() const override
46 { 47 {
47 return TypeUint16; 48 return TypeUint16;
48 } 49 }
49 50
50 private: 51 private:
51 inline Uint16Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned le ngth); 52 inline Uint16Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned le ngth);
52 // Make constructor visible to superclass. 53 // Make constructor visible to superclass.
53 friend class TypedArrayBase<unsigned short>; 54 friend class TypedArrayBase<unsigned short>;
54 }; 55 };
55 56
56 PassRefPtr<Uint16Array> Uint16Array::create(unsigned length) 57 PassRefPtr<Uint16Array> Uint16Array::createOrNull(unsigned length)
57 { 58 {
58 return TypedArrayBase<unsigned short>::create<Uint16Array>(length); 59 return TypedArrayBase<unsigned short>::createOrNull<Uint16Array>(length);
59 } 60 }
60 61
61 PassRefPtr<Uint16Array> Uint16Array::create(const unsigned short* array, unsigne d length) 62 PassRefPtr<Uint16Array> Uint16Array::createOrNull(const unsigned short* array, u nsigned length)
62 { 63 {
63 return TypedArrayBase<unsigned short>::create<Uint16Array>(array, length); 64 return TypedArrayBase<unsigned short>::createOrNull<Uint16Array>(array, leng th);
65 }
66
67 PassRefPtr<Uint16Array> Uint16Array::deprecatedCreateOrCrash(const unsigned shor t* array, unsigned length)
68 {
69 return TypedArrayBase<unsigned short>::deprecatedCreateOrCrash<Uint16Array>( array, length);
64 } 70 }
65 71
66 PassRefPtr<Uint16Array> Uint16Array::create(PassRefPtr<ArrayBuffer> buffer, unsi gned byteOffset, unsigned length) 72 PassRefPtr<Uint16Array> Uint16Array::create(PassRefPtr<ArrayBuffer> buffer, unsi gned byteOffset, unsigned length)
67 { 73 {
68 return TypedArrayBase<unsigned short>::create<Uint16Array>(buffer, byteOffse t, length); 74 return TypedArrayBase<unsigned short>::create<Uint16Array>(buffer, byteOffse t, length);
69 } 75 }
70 76
71 Uint16Array::Uint16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, un signed length) 77 Uint16Array::Uint16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, un signed length)
72 : IntegralTypedArrayBase<unsigned short>(buffer, byteOffset, length) 78 : IntegralTypedArrayBase<unsigned short>(buffer, byteOffset, length)
73 { 79 {
74 } 80 }
75 81
76 } // namespace WTF 82 } // namespace WTF
77 83
78 using WTF::Uint16Array; 84 using WTF::Uint16Array;
79 85
80 #endif // Uint16Array_h 86 #endif // Uint16Array_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/TypedArrayBase.h ('k') | third_party/WebKit/Source/wtf/Uint32Array.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698