Refactor dictionaries for use by entities other than just SkPicture
Review URL: https://codereview.appspot.com/6101043
git-svn-id: http://skia.googlecode.com/svn/trunk@4077 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp
index 3f8c998..e19cdeb 100644
--- a/src/effects/Sk2DPathEffect.cpp
+++ b/src/effects/Sk2DPathEffect.cpp
@@ -74,18 +74,11 @@
void Sk2DPathEffect::flatten(SkFlattenableWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
- char storage[SkMatrix::kMaxFlattenSize];
- uint32_t size = fMatrix.flatten(storage);
- buffer.write32(size);
- buffer.write(storage, size);
+ buffer.writeMatrix(fMatrix);
}
Sk2DPathEffect::Sk2DPathEffect(SkFlattenableReadBuffer& buffer) {
- char storage[SkMatrix::kMaxFlattenSize];
- uint32_t size = buffer.readS32();
- SkASSERT(size <= sizeof(storage));
- buffer.read(storage, size);
- fMatrix.unflatten(storage);
+ buffer.readMatrix(&fMatrix);
fMatrixIsInvertible = fMatrix.invert(&fInverse);
}
diff --git a/src/effects/SkGroupShape.cpp b/src/effects/SkGroupShape.cpp
index 83a2043..8ec87c4 100644
--- a/src/effects/SkGroupShape.cpp
+++ b/src/effects/SkGroupShape.cpp
@@ -92,13 +92,9 @@
const Rec* stop = fList.end();
while (rec < stop) {
buffer.writeFlattenable(rec->fShape);
+ buffer.writeBool(rec->fMatrixRef);
if (rec->fMatrixRef) {
- char storage[SkMatrix::kMaxFlattenSize];
- uint32_t size = rec->fMatrixRef->flatten(storage);
- buffer.write32(size);
- buffer.writePad(storage, size);
- } else {
- buffer.write32(0);
+ buffer.writeMatrix(*rec->fMatrixRef);
}
rec += 1;
}
@@ -109,12 +105,10 @@
for (int i = 0; i < count; i++) {
SkShape* shape = reinterpret_cast<SkShape*>(buffer.readFlattenable());
SkMatrixRef* mr = NULL;
- uint32_t size = buffer.readS32();
- if (size) {
- char storage[SkMatrix::kMaxFlattenSize];
- buffer.read(storage, SkAlign4(size));
+ bool hasMatrix = buffer.readBool();
+ if (hasMatrix) {
mr = SkNEW(SkMatrixRef);
- mr->unflatten(storage);
+ buffer.readMatrix(mr);
}
if (shape) {
this->appendShape(shape, mr)->unref();