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 "Resources.h" | 8 #include "Resources.h" |
9 #include "SkData.h" | 9 #include "SkData.h" |
10 #include "SkFrontBufferedStream.h" | 10 #include "SkFrontBufferedStream.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 stream3->rewind(); | 110 stream3->rewind(); |
111 test_loop_stream(reporter, stream3.get(), s, 26, 100); | 111 test_loop_stream(reporter, stream3.get(), s, 26, 100); |
112 } | 112 } |
113 | 113 |
114 for (i = 0; i < 100; i++) { | 114 for (i = 0; i < 100; i++) { |
115 REPORTER_ASSERT(reporter, ds.write(s, 26)); | 115 REPORTER_ASSERT(reporter, ds.write(s, 26)); |
116 } | 116 } |
117 REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26); | 117 REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26); |
118 | 118 |
119 { | 119 { |
120 sk_sp<SkData> data(ds.copyToData()); | 120 sk_sp<SkData> data = ds.snapshotAsData(); |
121 REPORTER_ASSERT(reporter, 100 * 26 == data->size()); | 121 REPORTER_ASSERT(reporter, 100 * 26 == data->size()); |
122 REPORTER_ASSERT(reporter, memcmp(dst, data->data(), data->size()) == 0); | 122 REPORTER_ASSERT(reporter, memcmp(dst, data->data(), data->size()) == 0); |
123 } | 123 } |
124 | 124 |
125 { | 125 { |
126 // Test that this works after a copyToData. | 126 // Test that this works after a snapshot. |
127 SkAutoTDelete<SkStreamAsset> stream(ds.detachAsStream()); | 127 SkAutoTDelete<SkStreamAsset> stream(ds.detachAsStream()); |
128 REPORTER_ASSERT(reporter, ds.getOffset() == 0); | 128 REPORTER_ASSERT(reporter, ds.getOffset() == 0); |
129 test_loop_stream(reporter, stream.get(), s, 26, 100); | 129 test_loop_stream(reporter, stream.get(), s, 26, 100); |
130 | 130 |
131 SkAutoTDelete<SkStreamAsset> stream2(stream->duplicate()); | 131 SkAutoTDelete<SkStreamAsset> stream2(stream->duplicate()); |
132 test_loop_stream(reporter, stream2.get(), s, 26, 100); | 132 test_loop_stream(reporter, stream2.get(), s, 26, 100); |
133 } | 133 } |
134 delete[] dst; | 134 delete[] dst; |
135 | 135 |
136 SkString tmpDir = skiatest::GetTmpDir(); | 136 SkString tmpDir = skiatest::GetTmpDir(); |
(...skipping 30 matching lines...) Expand all Loading... |
167 ERRORF(reporter, "sizes:%x != n:%x\n", i, sizes[i], n); | 167 ERRORF(reporter, "sizes:%x != n:%x\n", i, sizes[i], n); |
168 } | 168 } |
169 } | 169 } |
170 } | 170 } |
171 | 171 |
172 // Test that setting an SkMemoryStream to a nullptr data does not result in a cr
ash when calling | 172 // Test that setting an SkMemoryStream to a nullptr data does not result in a cr
ash when calling |
173 // methods that access fData. | 173 // methods that access fData. |
174 static void TestDereferencingData(SkMemoryStream* memStream) { | 174 static void TestDereferencingData(SkMemoryStream* memStream) { |
175 memStream->read(nullptr, 0); | 175 memStream->read(nullptr, 0); |
176 memStream->getMemoryBase(); | 176 memStream->getMemoryBase(); |
177 sk_sp<SkData> data(memStream->copyToData()); | 177 (void)memStream->asData(); |
178 } | 178 } |
179 | 179 |
180 static void TestNullData() { | 180 static void TestNullData() { |
181 SkData* nullData = nullptr; | 181 SkMemoryStream memStream(nullptr); |
182 SkMemoryStream memStream(nullData); | |
183 TestDereferencingData(&memStream); | 182 TestDereferencingData(&memStream); |
184 | 183 |
185 memStream.setData(nullData); | 184 memStream.setData(nullptr); |
186 TestDereferencingData(&memStream); | 185 TestDereferencingData(&memStream); |
187 | 186 |
188 } | 187 } |
189 | 188 |
190 DEF_TEST(Stream, reporter) { | 189 DEF_TEST(Stream, reporter) { |
191 TestWStream(reporter); | 190 TestWStream(reporter); |
192 TestPackedUInt(reporter); | 191 TestPackedUInt(reporter); |
193 TestNullData(); | 192 TestNullData(); |
194 } | 193 } |
195 | 194 |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 | 396 |
398 static void stream_copy_test(skiatest::Reporter* reporter, | 397 static void stream_copy_test(skiatest::Reporter* reporter, |
399 const void* srcData, | 398 const void* srcData, |
400 size_t N, | 399 size_t N, |
401 SkStream* stream) { | 400 SkStream* stream) { |
402 SkDynamicMemoryWStream tgt; | 401 SkDynamicMemoryWStream tgt; |
403 if (!SkStreamCopy(&tgt, stream)) { | 402 if (!SkStreamCopy(&tgt, stream)) { |
404 ERRORF(reporter, "SkStreamCopy failed"); | 403 ERRORF(reporter, "SkStreamCopy failed"); |
405 return; | 404 return; |
406 } | 405 } |
407 sk_sp<SkData> data(tgt.copyToData()); | 406 sk_sp<SkData> data(tgt.detachAsData()); |
408 tgt.reset(); | |
409 if (data->size() != N) { | 407 if (data->size() != N) { |
410 ERRORF(reporter, "SkStreamCopy incorrect size"); | 408 ERRORF(reporter, "SkStreamCopy incorrect size"); |
411 return; | 409 return; |
412 } | 410 } |
413 if (0 != memcmp(data->data(), srcData, N)) { | 411 if (0 != memcmp(data->data(), srcData, N)) { |
414 ERRORF(reporter, "SkStreamCopy bad copy"); | 412 ERRORF(reporter, "SkStreamCopy bad copy"); |
415 } | 413 } |
416 } | 414 } |
417 | 415 |
418 DEF_TEST(StreamCopy, reporter) { | 416 DEF_TEST(StreamCopy, reporter) { |
419 SkRandom random(123456); | 417 SkRandom random(123456); |
420 static const int N = 10000; | 418 static const int N = 10000; |
421 SkAutoTMalloc<uint8_t> src((size_t)N); | 419 SkAutoTMalloc<uint8_t> src((size_t)N); |
422 for (int j = 0; j < N; ++j) { | 420 for (int j = 0; j < N; ++j) { |
423 src[j] = random.nextU() & 0xff; | 421 src[j] = random.nextU() & 0xff; |
424 } | 422 } |
425 // SkStreamCopy had two code paths; this test both. | 423 // SkStreamCopy had two code paths; this test both. |
426 DumbStream dumbStream(src.get(), (size_t)N); | 424 DumbStream dumbStream(src.get(), (size_t)N); |
427 stream_copy_test(reporter, src, N, &dumbStream); | 425 stream_copy_test(reporter, src, N, &dumbStream); |
428 SkMemoryStream smartStream(src.get(), (size_t)N); | 426 SkMemoryStream smartStream(src.get(), (size_t)N); |
429 stream_copy_test(reporter, src, N, &smartStream); | 427 stream_copy_test(reporter, src, N, &smartStream); |
430 } | 428 } |
431 | 429 |
432 DEF_TEST(StreamEmptyStreamMemoryBase, r) { | 430 DEF_TEST(StreamEmptyStreamMemoryBase, r) { |
433 SkDynamicMemoryWStream tmp; | 431 SkDynamicMemoryWStream tmp; |
434 SkAutoTDelete<SkStreamAsset> asset(tmp.detachAsStream()); | 432 SkAutoTDelete<SkStreamAsset> asset(tmp.detachAsStream()); |
435 REPORTER_ASSERT(r, nullptr == asset->getMemoryBase()); | 433 REPORTER_ASSERT(r, nullptr == asset->getMemoryBase()); |
436 } | 434 } |
OLD | NEW |