a1193e4b0e
SkStream is a stateful object, so it does not make sense for it to have multiple owners. Make SkStream inherit directly from SkNoncopyable. Update methods which previously called SkStream::ref() (e.g. SkImageDecoder::buildTileIndex() and SkFrontBufferedStream::Create(), which required the existing owners to call SkStream::unref()) to take ownership of their SkStream parameters and delete when done (including on failure). Switch all SkAutoTUnref<SkStream>s to SkAutoTDelete<SkStream>s. In some cases this means heap allocating streams that were previously stack allocated. Respect ownership rules of SkTypeface::CreateFromStream() and SkImageDecoder::buildTileIndex(). Update the comments for exceptional methods which do not affect the ownership of their SkStream parameters (e.g. SkPicture::CreateFromStream() and SkTypeface::Deserialize()) to be explicit about ownership. Remove test_stream_life, which tested that buildTileIndex() behaved correctly when SkStream was a ref counted object. The test does not make sense now that it is not. In SkPDFStream, remove the SkMemoryStream member. Instead of using it, create a new SkMemoryStream to pass to fDataStream (which is now an SkAutoTDelete). Make other pdf rasterizers behave like SkPDFDocumentToBitmap. SkPDFDocumentToBitmap delete the SkStream, so do the same in the following pdf rasterizers: SkPopplerRasterizePDF SkNativeRasterizePDF SkNoRasterizePDF Requires a change to Android, which currently treats SkStreams as ref counted objects. Review URL: https://codereview.chromium.org/849103004
193 lines
5.9 KiB
C++
193 lines
5.9 KiB
C++
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkData.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkRandom.h"
|
|
#include "SkStream.h"
|
|
#include "Test.h"
|
|
|
|
#ifndef SK_BUILD_FOR_WIN
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
#define MAX_SIZE (256 * 1024)
|
|
|
|
static void test_loop_stream(skiatest::Reporter* reporter, SkStream* stream,
|
|
const void* src, size_t len, int repeat) {
|
|
SkAutoSMalloc<256> storage(len);
|
|
void* tmp = storage.get();
|
|
|
|
for (int i = 0; i < repeat; ++i) {
|
|
size_t bytes = stream->read(tmp, len);
|
|
REPORTER_ASSERT(reporter, bytes == len);
|
|
REPORTER_ASSERT(reporter, !memcmp(tmp, src, len));
|
|
}
|
|
|
|
// expect EOF
|
|
size_t bytes = stream->read(tmp, 1);
|
|
REPORTER_ASSERT(reporter, 0 == bytes);
|
|
// isAtEnd might not return true until after the first failing read.
|
|
REPORTER_ASSERT(reporter, stream->isAtEnd());
|
|
}
|
|
|
|
static void test_filestreams(skiatest::Reporter* reporter, const char* tmpDir) {
|
|
SkString path = SkOSPath::Join(tmpDir, "wstream_test");
|
|
|
|
const char s[] = "abcdefghijklmnopqrstuvwxyz";
|
|
|
|
{
|
|
SkFILEWStream writer(path.c_str());
|
|
if (!writer.isValid()) {
|
|
ERRORF(reporter, "Failed to create tmp file %s\n", path.c_str());
|
|
return;
|
|
}
|
|
|
|
for (int i = 0; i < 100; ++i) {
|
|
writer.write(s, 26);
|
|
}
|
|
}
|
|
|
|
{
|
|
SkFILEStream stream(path.c_str());
|
|
REPORTER_ASSERT(reporter, stream.isValid());
|
|
test_loop_stream(reporter, &stream, s, 26, 100);
|
|
|
|
SkAutoTDelete<SkStreamAsset> stream2(stream.duplicate());
|
|
test_loop_stream(reporter, stream2.get(), s, 26, 100);
|
|
}
|
|
|
|
{
|
|
FILE* file = ::fopen(path.c_str(), "rb");
|
|
SkFILEStream stream(file, SkFILEStream::kCallerPasses_Ownership);
|
|
REPORTER_ASSERT(reporter, stream.isValid());
|
|
test_loop_stream(reporter, &stream, s, 26, 100);
|
|
|
|
SkAutoTDelete<SkStreamAsset> stream2(stream.duplicate());
|
|
test_loop_stream(reporter, stream2.get(), s, 26, 100);
|
|
}
|
|
}
|
|
|
|
static void TestWStream(skiatest::Reporter* reporter) {
|
|
SkDynamicMemoryWStream ds;
|
|
const char s[] = "abcdefghijklmnopqrstuvwxyz";
|
|
int i;
|
|
for (i = 0; i < 100; i++) {
|
|
REPORTER_ASSERT(reporter, ds.write(s, 26));
|
|
}
|
|
REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
|
|
|
|
char* dst = new char[100 * 26 + 1];
|
|
dst[100*26] = '*';
|
|
ds.copyTo(dst);
|
|
REPORTER_ASSERT(reporter, dst[100*26] == '*');
|
|
for (i = 0; i < 100; i++) {
|
|
REPORTER_ASSERT(reporter, memcmp(&dst[i * 26], s, 26) == 0);
|
|
}
|
|
|
|
{
|
|
SkAutoTDelete<SkStreamAsset> stream(ds.detachAsStream());
|
|
REPORTER_ASSERT(reporter, 100 * 26 == stream->getLength());
|
|
REPORTER_ASSERT(reporter, ds.getOffset() == 0);
|
|
test_loop_stream(reporter, stream.get(), s, 26, 100);
|
|
|
|
SkAutoTDelete<SkStreamAsset> stream2(stream->duplicate());
|
|
test_loop_stream(reporter, stream2.get(), s, 26, 100);
|
|
|
|
SkAutoTDelete<SkStreamAsset> stream3(stream->fork());
|
|
REPORTER_ASSERT(reporter, stream3->isAtEnd());
|
|
char tmp;
|
|
size_t bytes = stream->read(&tmp, 1);
|
|
REPORTER_ASSERT(reporter, 0 == bytes);
|
|
stream3->rewind();
|
|
test_loop_stream(reporter, stream3.get(), s, 26, 100);
|
|
}
|
|
|
|
for (i = 0; i < 100; i++) {
|
|
REPORTER_ASSERT(reporter, ds.write(s, 26));
|
|
}
|
|
REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
|
|
|
|
{
|
|
SkAutoTUnref<SkData> data(ds.copyToData());
|
|
REPORTER_ASSERT(reporter, 100 * 26 == data->size());
|
|
REPORTER_ASSERT(reporter, memcmp(dst, data->data(), data->size()) == 0);
|
|
}
|
|
|
|
{
|
|
// Test that this works after a copyToData.
|
|
SkAutoTDelete<SkStreamAsset> stream(ds.detachAsStream());
|
|
REPORTER_ASSERT(reporter, ds.getOffset() == 0);
|
|
test_loop_stream(reporter, stream.get(), s, 26, 100);
|
|
|
|
SkAutoTDelete<SkStreamAsset> stream2(stream->duplicate());
|
|
test_loop_stream(reporter, stream2.get(), s, 26, 100);
|
|
}
|
|
delete[] dst;
|
|
|
|
SkString tmpDir = skiatest::GetTmpDir();
|
|
if (!tmpDir.isEmpty()) {
|
|
test_filestreams(reporter, tmpDir.c_str());
|
|
}
|
|
}
|
|
|
|
static void TestPackedUInt(skiatest::Reporter* reporter) {
|
|
// we know that packeduint tries to write 1, 2 or 4 bytes for the length,
|
|
// so we test values around each of those transitions (and a few others)
|
|
const size_t sizes[] = {
|
|
0, 1, 2, 0xFC, 0xFD, 0xFE, 0xFF, 0x100, 0x101, 32767, 32768, 32769,
|
|
0xFFFD, 0xFFFE, 0xFFFF, 0x10000, 0x10001,
|
|
0xFFFFFD, 0xFFFFFE, 0xFFFFFF, 0x1000000, 0x1000001,
|
|
0x7FFFFFFE, 0x7FFFFFFF, 0x80000000, 0x80000001, 0xFFFFFFFE, 0xFFFFFFFF
|
|
};
|
|
|
|
|
|
size_t i;
|
|
char buffer[sizeof(sizes) * 4];
|
|
|
|
SkMemoryWStream wstream(buffer, sizeof(buffer));
|
|
for (i = 0; i < SK_ARRAY_COUNT(sizes); ++i) {
|
|
bool success = wstream.writePackedUInt(sizes[i]);
|
|
REPORTER_ASSERT(reporter, success);
|
|
}
|
|
wstream.flush();
|
|
|
|
SkMemoryStream rstream(buffer, sizeof(buffer));
|
|
for (i = 0; i < SK_ARRAY_COUNT(sizes); ++i) {
|
|
size_t n = rstream.readPackedUInt();
|
|
if (sizes[i] != n) {
|
|
SkDebugf("-- %d: sizes:%x n:%x\n", i, sizes[i], n);
|
|
}
|
|
REPORTER_ASSERT(reporter, sizes[i] == n);
|
|
}
|
|
}
|
|
|
|
// Test that setting an SkMemoryStream to a NULL data does not result in a crash when calling
|
|
// methods that access fData.
|
|
static void TestDereferencingData(SkMemoryStream* memStream) {
|
|
memStream->read(NULL, 0);
|
|
memStream->getMemoryBase();
|
|
SkAutoDataUnref data(memStream->copyToData());
|
|
}
|
|
|
|
static void TestNullData() {
|
|
SkData* nullData = NULL;
|
|
SkMemoryStream memStream(nullData);
|
|
TestDereferencingData(&memStream);
|
|
|
|
memStream.setData(nullData);
|
|
TestDereferencingData(&memStream);
|
|
|
|
}
|
|
|
|
DEF_TEST(Stream, reporter) {
|
|
TestWStream(reporter);
|
|
TestPackedUInt(reporter);
|
|
TestNullData();
|
|
}
|