@@ -27,78 +27,78 @@ using v8::Value; |
27 | 27 |
|
28 | 28 | template <typename ResourceType, typename TypeName> |
29 | 29 | class ExternString: public ResourceType { |
30 | | - public: |
31 | | - ~ExternString() override { |
32 | | - free(const_cast<TypeName*>(data_)); |
33 | | - isolate()->AdjustAmountOfExternalAllocatedMemory(-byte_length()); |
34 | | - } |
35 | | - |
36 | | - const TypeName* data() const override { |
37 | | - return data_; |
38 | | - } |
| 30 | + public: |
| 31 | + ~ExternString() override { |
| 32 | + free(const_cast<TypeName*>(data_)); |
| 33 | + isolate()->AdjustAmountOfExternalAllocatedMemory(-byte_length()); |
| 34 | + } |
39 | 35 |
|
40 | | - size_t length() const override { |
41 | | - return length_; |
42 | | - } |
| 36 | + const TypeName* data() const override { |
| 37 | + return data_; |
| 38 | + } |
43 | 39 |
|
44 | | - int64_t byte_length() const { |
45 | | - return length() * sizeof(*data()); |
46 | | - } |
| 40 | + size_t length() const override { |
| 41 | + return length_; |
| 42 | + } |
47 | 43 |
|
48 | | - static Local<String> NewFromCopy(Isolate* isolate, |
49 | | - const TypeName* data, |
50 | | - size_t length) { |
51 | | - EscapableHandleScope scope(isolate); |
| 44 | + int64_t byte_length() const { |
| 45 | + return length() * sizeof(*data()); |
| 46 | + } |
52 | 47 |
|
53 | | - if (length == 0) |
54 | | - return scope.Escape(String::Empty(isolate)); |
| 48 | + static Local<String> NewFromCopy(Isolate* isolate, |
| 49 | + const TypeName* data, |
| 50 | + size_t length) { |
| 51 | + EscapableHandleScope scope(isolate); |
55 | 52 |
|
56 | | - TypeName* new_data = |
57 | | - static_cast<TypeName*>(malloc(length * sizeof(*new_data))); |
58 | | - if (new_data == nullptr) { |
59 | | - return Local<String>(); |
60 | | - } |
61 | | - memcpy(new_data, data, length * sizeof(*new_data)); |
| 53 | + if (length == 0) |
| 54 | + return scope.Escape(String::Empty(isolate)); |
62 | 55 |
|
63 | | - return scope.Escape(ExternString<ResourceType, TypeName>::New(isolate, |
64 | | - new_data, |
65 | | - length)); |
| 56 | + TypeName* new_data = |
| 57 | + static_cast<TypeName*>(malloc(length * sizeof(*new_data))); |
| 58 | + if (new_data == nullptr) { |
| 59 | + return Local<String>(); |
66 | 60 | } |
| 61 | + memcpy(new_data, data, length * sizeof(*new_data)); |
67 | 62 |
|
68 | | - // uses "data" for external resource, and will be free'd on gc |
69 | | - static Local<String> New(Isolate* isolate, |
70 | | - const TypeName* data, |
71 | | - size_t length) { |
72 | | - EscapableHandleScope scope(isolate); |
| 63 | + return scope.Escape(ExternString<ResourceType, TypeName>::New(isolate, |
| 64 | + new_data, |
| 65 | + length)); |
| 66 | + } |
73 | 67 |
|
74 | | - if (length == 0) |
75 | | - return scope.Escape(String::Empty(isolate)); |
| 68 | + // uses "data" for external resource, and will be free'd on gc |
| 69 | + static Local<String> New(Isolate* isolate, |
| 70 | + const TypeName* data, |
| 71 | + size_t length) { |
| 72 | + EscapableHandleScope scope(isolate); |
76 | 73 |
|
77 | | - ExternString* h_str = new ExternString<ResourceType, TypeName>(isolate, |
78 | | - data, |
79 | | - length); |
80 | | - MaybeLocal<String> str = NewExternal(isolate, h_str); |
81 | | - isolate->AdjustAmountOfExternalAllocatedMemory(h_str->byte_length()); |
| 74 | + if (length == 0) |
| 75 | + return scope.Escape(String::Empty(isolate)); |
82 | 76 |
|
83 | | - if (str.IsEmpty()) { |
84 | | - delete h_str; |
85 | | - return Local<String>(); |
86 | | - } |
| 77 | + ExternString* h_str = new ExternString<ResourceType, TypeName>(isolate, |
| 78 | + data, |
| 79 | + length); |
| 80 | + MaybeLocal<String> str = NewExternal(isolate, h_str); |
| 81 | + isolate->AdjustAmountOfExternalAllocatedMemory(h_str->byte_length()); |
87 | 82 |
|
88 | | - return scope.Escape(str.ToLocalChecked()); |
| 83 | + if (str.IsEmpty()) { |
| 84 | + delete h_str; |
| 85 | + return Local<String>(); |
89 | 86 | } |
90 | 87 |
|
91 | | - inline Isolate* isolate() const { return isolate_; } |
| 88 | + return scope.Escape(str.ToLocalChecked()); |
| 89 | + } |
| 90 | + |
| 91 | + inline Isolate* isolate() const { return isolate_; } |
92 | 92 |
|
93 | | - private: |
94 | | - ExternString(Isolate* isolate, const TypeName* data, size_t length) |
95 | | - : isolate_(isolate), data_(data), length_(length) { } |
96 | | - static MaybeLocal<String> NewExternal(Isolate* isolate, |
97 | | - ExternString* h_str); |
| 93 | + private: |
| 94 | + ExternString(Isolate* isolate, const TypeName* data, size_t length) |
| 95 | + : isolate_(isolate), data_(data), length_(length) { } |
| 96 | + static MaybeLocal<String> NewExternal(Isolate* isolate, |
| 97 | + ExternString* h_str); |
98 | 98 |
|
99 | | - Isolate* isolate_; |
100 | | - const TypeName* data_; |
101 | | - size_t length_; |
| 99 | + Isolate* isolate_; |
| 100 | + const TypeName* data_; |
| 101 | + size_t length_; |
102 | 102 | }; |
103 | 103 |
|
104 | 104 |
|
|