AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Revert "use serialprocs for typefaces""

Browse Source 
This reverts commit 1a104bce20.

Change (from first version) is
- only signal error in readbuffer for corrupt stream, not default fonts
- change test to ensure a non-null typeface (i.e. MakeDefault())

Bug: skia:
Change-Id: I325445b56b0a402e1b89a2439df06e92314c793f
Reviewed-on: https://skia-review.googlesource.com/82687
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2017-12-08 13:20:01 -05:00 committed by Skia Commit-Bot
parent eace8cd22a
commit 8e74cbcd65
6 changed files with 106 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkTextBlob.h
View File

@ -17,6 +17,9 @@
class SkReadBuffer;
class SkWriteBuffer;
struct SkSerialProcs;
struct SkDeserialProcs;
typedef void (*SkTypefaceCatalogerProc)(SkTypeface*, void* ctx);
typedef sk_sp<SkTypeface> (*SkTypefaceResolverProc)(uint32_t id, void* ctx);
@ -71,6 +74,9 @@ public:
static sk_sp<SkTextBlob> Deserialize(const void* data, size_t size,
SkTypefaceResolverProc, void* ctx);
sk_sp<SkData> serialize(const SkSerialProcs&) const;
static sk_sp<SkTextBlob> Deserialize(const void* data, size_t size, const SkDeserialProcs&);
private:
friend class SkNVRefCnt<SkTextBlob>;
class RunRecord;

22
src/core/SkReadBuffer.cpp
View File

@ -362,12 +362,26 @@ sk_sp<SkTypeface> SkReadBuffer::readTypeface() {
return sk_ref_sp(fInflator->getTypeface(this->read32()));
}
uint32_t index = this->readUInt();
if (0 == index || index > (unsigned)fTFCount) {
// Read 32 bits (signed)
// 0 -- return null (default font)
// >0 -- index
// <0 -- custom (serial procs) : negative size in bytes
int32_t index = this->readUInt();
if (index == 0) {
return nullptr;
} else {
SkASSERT(fTFArray);
} else if (index > 0) {
if (!this->validate(index <= fTFCount)) {
return nullptr;
}
return sk_ref_sp(fTFArray[index - 1]);
} else { // custom
size_t size = -index;
const void* data = this->skip(size);
if (!this->validate(data != nullptr)) {
return nullptr;
}
return fProcs.fTypefaceProc(data, size, fProcs.fTypefaceCtx);
}
}

2
src/core/SkReadBuffer.h
View File

@ -184,7 +184,7 @@ public:
// be created (e.g. it was not originally encoded) then this returns an image that doesn't
// draw.
sk_sp<SkImage> readImage();
virtual sk_sp<SkTypeface> readTypeface();
sk_sp<SkTypeface> readTypeface();
void setTypefaceArray(SkTypeface* array[], int count) {
fTFArray = array;

89
src/core/SkTextBlob.cpp
View File

@ -868,25 +868,9 @@ sk_sp<SkTextBlob> SkTextBlob::MakeFromBuffer(SkReadBuffer& reader) {
return blobBuilder.make();
}
class SkTypefaceCatalogerWriteBuffer : public SkBinaryWriteBuffer {
public:
SkTypefaceCatalogerWriteBuffer(SkTypefaceCatalogerProc proc, void* ctx)
: SkBinaryWriteBuffer(SkBinaryWriteBuffer::kCrossProcess_Flag)
, fCatalogerProc(proc)
, fCatalogerCtx(ctx)
{}
void writeTypeface(SkTypeface* typeface) override {
fCatalogerProc(typeface, fCatalogerCtx);
this->write32(typeface ? typeface->uniqueID() : 0);
}
SkTypefaceCatalogerProc fCatalogerProc;
void* fCatalogerCtx;
};
sk_sp<SkData> SkTextBlob::serialize(SkTypefaceCatalogerProc proc, void* ctx) const {
SkTypefaceCatalogerWriteBuffer buffer(proc, ctx);
sk_sp<SkData> SkTextBlob::serialize(const SkSerialProcs& procs) const {
SkBinaryWriteBuffer buffer;
buffer.setSerialProcs(procs);
this->flatten(buffer);
size_t total = buffer.bytesWritten();
@ -895,26 +879,61 @@ sk_sp<SkData> SkTextBlob::serialize(SkTypefaceCatalogerProc proc, void* ctx) con
return data;
}
class SkTypefaceResolverReadBuffer : public SkReadBuffer {
public:
SkTypefaceResolverReadBuffer(const void* data, size_t size, SkTypefaceResolverProc proc,
void* ctx)
: SkReadBuffer(data, size)
, fResolverProc(proc)
, fResolverCtx(ctx)
{}
sk_sp<SkTypeface> readTypeface() override {
auto id = this->readUInt();
return this->isValid() ? fResolverProc(id, fResolverCtx) : nullptr;
sk_sp<SkTextBlob> SkTextBlob::Deserialize(const void* data, size_t length,
const SkDeserialProcs& procs) {
SkReadBuffer buffer(data, length);
buffer.setDeserialProcs(procs);
return SkTextBlob::MakeFromBuffer(buffer);
}
SkTypefaceResolverProc fResolverProc;
void* fResolverCtx;
///////////////////////////////////////////////////////////////////////////////////////////////////
namespace {
struct CatalogState {
SkTypefaceCatalogerProc fProc;
void* fCtx;
};
sk_sp<SkData> catalog_typeface_proc(SkTypeface* face, void* ctx) {
CatalogState* state = static_cast<CatalogState*>(ctx);
state->fProc(face, state->fCtx);
uint32_t id = face->uniqueID();
return SkData::MakeWithCopy(&id, sizeof(uint32_t));
}
}
sk_sp<SkData> SkTextBlob::serialize(SkTypefaceCatalogerProc proc, void* ctx) const {
CatalogState state = { proc, ctx };
SkSerialProcs procs;
procs.fTypefaceProc = catalog_typeface_proc;
procs.fTypefaceCtx = &state;
return this->serialize(procs);
}
namespace {
struct ResolverState {
SkTypefaceResolverProc fProc;
void* fCtx;
};
sk_sp<SkTypeface> resolver_typeface_proc(const void* data, size_t length, void* ctx) {
SkASSERT(length == 4);
if (length != 4) {
return nullptr;
}
ResolverState* state = static_cast<ResolverState*>(ctx);
uint32_t id;
memcpy(&id, data, length);
return state->fProc(id, state->fCtx);
}
}
sk_sp<SkTextBlob> SkTextBlob::Deserialize(const void* data, size_t length,
SkTypefaceResolverProc proc, void* ctx) {
SkTypefaceResolverReadBuffer buffer(data, length, proc, ctx);
return SkTextBlob::MakeFromBuffer(buffer);
ResolverState state = { proc, ctx };
SkDeserialProcs procs;
procs.fTypefaceProc = resolver_typeface_proc;
procs.fTypefaceCtx = &state;
return Deserialize(data, length, procs);
}

25
src/core/SkWriteBuffer.cpp
View File

@ -181,11 +181,30 @@ void SkBinaryWriteBuffer::writeTypeface(SkTypeface* obj) {
return;
}
if (nullptr == obj || nullptr == fTFSet) {
// Write 32 bits (signed)
// 0 -- default font
// >0 -- index
// <0 -- custom (serial procs)
if (obj == nullptr) {
fWriter.write32(0);
} else {
fWriter.write32(fTFSet->add(obj));
} else if (fProcs.fTypefaceProc) {
auto data = fProcs.fTypefaceProc(obj, fProcs.fTypefaceCtx);
if (data) {
size_t size = data->size();
if (!sk_64_isS32(size)) {
size = 0; // fall back to default font
}
int32_t ssize = SkToS32(size);
fWriter.write32(-ssize); // negative to signal custom
if (size) {
this->writePad32(data->data(), size);
}
return;
}
// no data means fall through for std behavior
}
fWriter.write32(fTFSet ? fTFSet->add(obj) : 0);
}
void SkBinaryWriteBuffer::writePaint(const SkPaint& paint) {

10
tests/TextBlobTest.cpp
View File

@ -426,12 +426,11 @@ static sk_sp<SkImage> render(const SkTextBlob* blob) {
*/
DEF_TEST(TextBlob_serialize, reporter) {
sk_sp<SkTextBlob> blob0 = []() {
sk_sp<SkTypeface> tf0;
sk_sp<SkTypeface> tf1 = SkTypeface::MakeFromName("Times", SkFontStyle());
sk_sp<SkTypeface> tf = SkTypeface::MakeDefault();
SkTextBlobBuilder builder;
add_run(&builder, "Hello", 10, 20, tf0);
add_run(&builder, "World", 10, 40, tf1);
add_run(&builder, "Hello", 10, 20, nullptr); // we don't flatten this in the paint
add_run(&builder, "World", 10, 40, tf); // we will flatten this in the paint
return builder.make();
}();
@ -442,7 +441,8 @@ DEF_TEST(TextBlob_serialize, reporter) {
*array->append() = tf;
}
}, &array);
REPORTER_ASSERT(reporter, array.count() > 0);
// we only expect 1, since null would not have been serialized, but the default would
REPORTER_ASSERT(reporter, array.count() == 1);
sk_sp<SkTextBlob> blob1 = SkTextBlob::Deserialize(data->data(), data->size(),
[](uint32_t uniqueID, void* ctx) {