Rename the existing flatten(void*) methods.
This change avoids naminc confusion with the SkFlattenable flatten methods and
also changes SkPath to use the void* model instead of taking a SkReader32.
Review URL: https://codereview.appspot.com/6299062
git-svn-id: http://skia.googlecode.com/svn/trunk@4215 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 9a0147d..7133658 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1737,7 +1737,7 @@
///////////////////////////////////////////////////////////////////////////////
-uint32_t SkMatrix::flatten(void* buffer) const {
+uint32_t SkMatrix::writeToMemory(void* buffer) const {
// TODO write less for simple matrices
if (buffer) {
memcpy(buffer, fMat, 9 * sizeof(SkScalar));
@@ -1745,7 +1745,7 @@
return 9 * sizeof(SkScalar);
}
-uint32_t SkMatrix::unflatten(const void* buffer) {
+uint32_t SkMatrix::readFromMemory(const void* buffer) {
if (buffer) {
memcpy(fMat, buffer, 9 * sizeof(SkScalar));
this->setTypeMask(kUnknown_Mask);
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 4dab604..034a515 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -8,8 +8,7 @@
#include "SkPath.h"
-#include "SkReader32.h"
-#include "SkWriter32.h"
+#include "SkBuffer.h"
#include "SkMath.h"
// This value is just made-up for now. When count is 4, calling memset was much
@@ -1685,20 +1684,31 @@
///////////////////////////////////////////////////////////////////////////////
/*
- Format in flattened buffer: [ptCount, verbCount, pts[], verbs[]]
+ Format in compressed buffer: [ptCount, verbCount, pts[], verbs[]]
*/
-void SkPath::flatten(SkWriter32& buffer) const {
+uint32_t SkPath::writeToMemory(void* storage) const {
SkDEBUGCODE(this->validate();)
+ if (NULL == storage) {
+ const int byteCount = 3 * sizeof(int32_t)
+ + sizeof(SkPoint) * fPts.count()
+ + sizeof(uint8_t) * fVerbs.count();
+ return SkAlign4(byteCount);
+ }
+
+ SkWBuffer buffer(storage);
buffer.write32(fPts.count());
buffer.write32(fVerbs.count());
buffer.write32((fFillType << 8) | fSegmentMask);
- buffer.writeMul4(fPts.begin(), sizeof(SkPoint) * fPts.count());
- buffer.writePad(fVerbs.begin(), fVerbs.count());
+ buffer.write(fPts.begin(), sizeof(SkPoint) * fPts.count());
+ buffer.write(fVerbs.begin(), fVerbs.count());
+ buffer.padToAlign4();
+ return buffer.pos();
}
-void SkPath::unflatten(SkReader32& buffer) {
+uint32_t SkPath::readFromMemory(const void* storage) {
+ SkRBuffer buffer(storage);
fPts.setCount(buffer.readS32());
fVerbs.setCount(buffer.readS32());
uint32_t packed = buffer.readS32();
@@ -1706,11 +1716,13 @@
fSegmentMask = packed & 0xFF;
buffer.read(fPts.begin(), sizeof(SkPoint) * fPts.count());
buffer.read(fVerbs.begin(), fVerbs.count());
+ buffer.skipToAlign4();
GEN_ID_INC;
DIRTY_AFTER_EDIT;
SkDEBUGCODE(this->validate();)
+ return buffer.pos();
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index e403b19..ce5ed8a 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -1076,7 +1076,7 @@
#include "SkBuffer.h"
-uint32_t SkRegion::flatten(void* storage) const {
+uint32_t SkRegion::writeToMemory(void* storage) const {
if (NULL == storage) {
uint32_t size = sizeof(int32_t); // -1 (empty), 0 (rect), runCount
if (!this->isEmpty()) {
@@ -1109,7 +1109,7 @@
return buffer.pos();
}
-uint32_t SkRegion::unflatten(const void* storage) {
+uint32_t SkRegion::readFromMemory(const void* storage) {
SkRBuffer buffer(storage);
SkRegion tmp;
int32_t count;
diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
index ddc0cc4..85f46fd 100644
--- a/src/pipe/SkGPipeRead.cpp
+++ b/src/pipe/SkGPipeRead.cpp
@@ -142,7 +142,7 @@
static void clipPath_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
SkGPipeState* state) {
SkPath path;
- path.unflatten(*reader);
+ reader->readPath(&path);
canvas->clipPath(path, (SkRegion::Op)DrawOp_unpackData(op32),
reader->readBool());
}
@@ -260,7 +260,7 @@
static void drawPath_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
SkGPipeState* state) {
SkPath path;
- path.unflatten(*reader);
+ reader->readPath(&path);
canvas->drawPath(path, state->paint());
}
@@ -331,7 +331,7 @@
const void* text = reader->skip(SkAlign4(len));
SkPath path;
- path.unflatten(*reader);
+ reader->readPath(&path);
SkMatrix matrixStorage;
const SkMatrix* matrix = NULL;
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index 5d35988..24ca0ea 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -43,22 +43,6 @@
return NULL;
}
-static size_t estimateFlattenSize(const SkPath& path) {
- int n = path.countPoints();
- size_t bytes = 3 * sizeof(int32_t);
- bytes += n * sizeof(SkPoint);
- bytes += SkAlign4(n + 2); // verbs: add 2 for move/close extras
-
-#ifdef SK_DEBUG
- {
- SkWriter32 writer(1024);
- path.flatten(writer);
- SkASSERT(writer.size() <= bytes);
- }
-#endif
- return bytes;
-}
-
static size_t writeTypeface(SkWriter32* writer, SkTypeface* typeface) {
SkASSERT(typeface);
SkDynamicMemoryWStream stream;
@@ -449,7 +433,7 @@
bool SkGPipeCanvas::concat(const SkMatrix& matrix) {
if (!matrix.isIdentity()) {
NOTIFY_SETUP(this);
- if (this->needOpBytes(matrix.flatten(NULL))) {
+ if (this->needOpBytes(matrix.writeToMemory(NULL))) {
this->writeOp(kConcat_DrawOp);
fWriter.writeMatrix(matrix);
}
@@ -459,7 +443,7 @@
void SkGPipeCanvas::setMatrix(const SkMatrix& matrix) {
NOTIFY_SETUP(this);
- if (this->needOpBytes(matrix.flatten(NULL))) {
+ if (this->needOpBytes(matrix.writeToMemory(NULL))) {
this->writeOp(kSetMatrix_DrawOp);
fWriter.writeMatrix(matrix);
}
@@ -480,9 +464,9 @@
bool SkGPipeCanvas::clipPath(const SkPath& path, SkRegion::Op rgnOp,
bool doAntiAlias) {
NOTIFY_SETUP(this);
- if (this->needOpBytes(estimateFlattenSize(path)) + sizeof(bool)) {
+ if (this->needOpBytes(path.writeToMemory(NULL)) + sizeof(bool)) {
this->writeOp(kClipPath_DrawOp, 0, rgnOp);
- path.flatten(fWriter);
+ fWriter.writePath(path);
fWriter.writeBool(doAntiAlias);
}
// we just pass on the bounds of the path
@@ -491,7 +475,7 @@
bool SkGPipeCanvas::clipRegion(const SkRegion& region, SkRegion::Op rgnOp) {
NOTIFY_SETUP(this);
- if (this->needOpBytes(region.flatten(NULL))) {
+ if (this->needOpBytes(region.writeToMemory(NULL))) {
this->writeOp(kClipRegion_DrawOp, 0, rgnOp);
fWriter.writeRegion(region);
}
@@ -547,9 +531,9 @@
void SkGPipeCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
NOTIFY_SETUP(this);
this->writePaint(paint);
- if (this->needOpBytes(estimateFlattenSize(path))) {
+ if (this->needOpBytes(path.writeToMemory(NULL))) {
this->writeOp(kDrawPath_DrawOp);
- path.flatten(fWriter);
+ fWriter.writePath(path);
}
}
@@ -696,10 +680,10 @@
if (byteLength) {
NOTIFY_SETUP(this);
unsigned flags = 0;
- size_t size = 4 + SkAlign4(byteLength) + estimateFlattenSize(path);
+ size_t size = 4 + SkAlign4(byteLength) + path.writeToMemory(NULL);
if (matrix) {
flags |= kDrawTextOnPath_HasMatrix_DrawOpFlag;
- size += matrix->flatten(NULL);
+ size += matrix->writeToMemory(NULL);
}
this->writePaint(paint);
if (this->needOpBytes(size)) {
@@ -708,7 +692,7 @@
fWriter.write32(byteLength);
fWriter.writePad(text, byteLength);
- path.flatten(fWriter);
+ fWriter.writePath(path);
if (matrix) {
fWriter.writeMatrix(*matrix);
}