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

use type name as identifier instead of factory

Browse Source 
This allows serializable types that can't be deserialized, e.g. for
creating font descriptors even with effect deserialization disabled.

Change-Id: I70a38ce2e34b192e5c87f6a341d090e5e444fc70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295193
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2020-06-09 09:56:18 -05:00 committed by Skia Commit-Bot
parent 237f794e64
commit 8f45e4d1b5
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/SkWriteBuffer.cpp
View File

@ -219,32 +219,29 @@ void SkBinaryWriteBuffer::writeFlattenable(const SkFlattenable* flattenable) {
* already written the string, we write its index instead.
*/
SkFlattenable::Factory factory = flattenable->getFactory();
SkASSERT(factory);
if (fFactorySet) {
SkFlattenable::Factory factory = flattenable->getFactory();
SkASSERT(factory);
this->write32(fFactorySet->add(factory));
} else {
const char* name = flattenable->getTypeName();
SkASSERT(name);
SkASSERT(0 != strcmp("", name));
if (uint32_t* indexPtr = fFlattenableDict.find(factory)) {
if (uint32_t* indexPtr = fFlattenableDict.find(name)) {
// We will write the index as a 32-bit int. We want the first byte
// that we send to be zero - this will act as a sentinel that we
// have an index (not a string). This means that we will send the
// the index shifted left by 8. The remaining 24-bits should be
// plenty to store the index. Note that this strategy depends on
// being little endian.
// being little endian, and type names being non-empty.
SkASSERT(0 == *indexPtr >> 24);
this->write32(*indexPtr << 8);
} else {
const char* name = flattenable->getTypeName();
SkASSERT(name);
// Otherwise write the string. Clients should not use the empty
// string as a name, or we will have a problem.
SkASSERT(0 != strcmp("", name));
this->writeString(name);
// Add key to dictionary.
fFlattenableDict.set(factory, fFlattenableDict.count() + 1);
fFlattenableDict.set(name, fFlattenableDict.count() + 1);
}
}

2
src/core/SkWriteBuffer.h
View File

@ -133,7 +133,7 @@ private:
SkWriter32 fWriter;
// Only used if we do not have an fFactorySet
SkTHashMap<SkFlattenable::Factory, uint32_t> fFlattenableDict;
SkTHashMap<const char*, uint32_t> fFlattenableDict;
};
#endif // SkWriteBuffer_DEFINED