OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "SkData.h" | 8 #include "SkData.h" |
9 #include "SkDataTable.h" | 9 #include "SkDataTable.h" |
10 #include "SkOSFile.h" | 10 #include "SkOSFile.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 DEF_TEST(DataTable, reporter) { | 136 DEF_TEST(DataTable, reporter) { |
137 test_emptytable(reporter); | 137 test_emptytable(reporter); |
138 test_simpletable(reporter); | 138 test_simpletable(reporter); |
139 test_vartable(reporter); | 139 test_vartable(reporter); |
140 test_tablebuilder(reporter); | 140 test_tablebuilder(reporter); |
141 test_globaltable(reporter); | 141 test_globaltable(reporter); |
142 } | 142 } |
143 | 143 |
144 static void* gGlobal; | 144 static void* gGlobal; |
145 | 145 |
146 static void delete_int_proc(const void* ptr, size_t len, void* context) { | 146 static void delete_int_proc(const void* ptr, void* context) { |
147 int* data = (int*)ptr; | 147 int* data = (int*)ptr; |
148 SkASSERT(context == gGlobal); | 148 SkASSERT(context == gGlobal); |
149 delete[] data; | 149 delete[] data; |
150 } | 150 } |
151 | 151 |
| 152 #ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS |
| 153 static void legacy_delete_int_proc(const void* ptr, size_t size, void* context)
{ |
| 154 int* data = (int*)ptr; |
| 155 SkASSERT(context == gGlobal); |
| 156 delete[] data; |
| 157 } |
| 158 #endif |
| 159 |
152 static void assert_len(skiatest::Reporter* reporter, SkData* ref, size_t len) { | 160 static void assert_len(skiatest::Reporter* reporter, SkData* ref, size_t len) { |
153 REPORTER_ASSERT(reporter, ref->size() == len); | 161 REPORTER_ASSERT(reporter, ref->size() == len); |
154 } | 162 } |
155 | 163 |
156 static void assert_data(skiatest::Reporter* reporter, SkData* ref, | 164 static void assert_data(skiatest::Reporter* reporter, SkData* ref, |
157 const void* data, size_t len) { | 165 const void* data, size_t len) { |
158 REPORTER_ASSERT(reporter, ref->size() == len); | 166 REPORTER_ASSERT(reporter, ref->size() == len); |
159 REPORTER_ASSERT(reporter, !memcmp(ref->data(), data, len)); | 167 REPORTER_ASSERT(reporter, !memcmp(ref->data(), data, len)); |
160 } | 168 } |
161 | 169 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 | 214 |
207 DEF_TEST(Data, reporter) { | 215 DEF_TEST(Data, reporter) { |
208 const char* str = "We the people, in order to form a more perfect union."; | 216 const char* str = "We the people, in order to form a more perfect union."; |
209 const int N = 10; | 217 const int N = 10; |
210 | 218 |
211 SkAutoTUnref<SkData> r0(SkData::NewEmpty()); | 219 SkAutoTUnref<SkData> r0(SkData::NewEmpty()); |
212 SkAutoTUnref<SkData> r1(SkData::NewWithCopy(str, strlen(str))); | 220 SkAutoTUnref<SkData> r1(SkData::NewWithCopy(str, strlen(str))); |
213 SkAutoTUnref<SkData> r2(SkData::NewWithProc(new int[N], N*sizeof(int), | 221 SkAutoTUnref<SkData> r2(SkData::NewWithProc(new int[N], N*sizeof(int), |
214 delete_int_proc, gGlobal)); | 222 delete_int_proc, gGlobal)); |
215 SkAutoTUnref<SkData> r3(SkData::NewSubset(r1, 7, 6)); | 223 SkAutoTUnref<SkData> r3(SkData::NewSubset(r1, 7, 6)); |
| 224 #ifdef SK_SUPPORT_LEGACY_DATARELEASEPROC_PARAMS |
| 225 SkAutoTUnref<SkData> r4(SkData::NewWithProc(new int[N], N*sizeof(int), |
| 226 legacy_delete_int_proc, gGlobal)
); |
| 227 #endif |
216 | 228 |
217 assert_len(reporter, r0, 0); | 229 assert_len(reporter, r0, 0); |
218 assert_len(reporter, r1, strlen(str)); | 230 assert_len(reporter, r1, strlen(str)); |
219 assert_len(reporter, r2, N * sizeof(int)); | 231 assert_len(reporter, r2, N * sizeof(int)); |
220 assert_len(reporter, r3, 6); | 232 assert_len(reporter, r3, 6); |
221 | 233 |
222 assert_data(reporter, r1, str, strlen(str)); | 234 assert_data(reporter, r1, str, strlen(str)); |
223 assert_data(reporter, r3, "people", 6); | 235 assert_data(reporter, r3, "people", 6); |
224 | 236 |
225 SkData* tmp = SkData::NewSubset(r1, strlen(str), 10); | 237 SkData* tmp = SkData::NewSubset(r1, strlen(str), 10); |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 } | 318 } |
307 | 319 |
308 for (int i = 0; i < N; ++i) { | 320 for (int i = 0; i < N; ++i) { |
309 REPORTER_ASSERT(reporter, (i + 1) * 26U == readers[i]->size()); | 321 REPORTER_ASSERT(reporter, (i + 1) * 26U == readers[i]->size()); |
310 check_alphabet_buffer(reporter, readers[i]); | 322 check_alphabet_buffer(reporter, readers[i]); |
311 check_alphabet_stream(reporter, streams[i]); | 323 check_alphabet_stream(reporter, streams[i]); |
312 readers[i]->unref(); | 324 readers[i]->unref(); |
313 SkDELETE(streams[i]); | 325 SkDELETE(streams[i]); |
314 } | 326 } |
315 } | 327 } |
OLD | NEW |