From a2bd2d12ad9504583e9311404fcd82b40df49d30 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 30 Jan 2014 22:16:32 +0000 Subject: Set write buffer flags only in SkWriteBuffer and SkFlatController constructors. This is a baby step toward refactored (and faster in-process) typeface and flattenable factory encoding and decoding. The sooner SkWriteBuffer knows its flags, the better. Next steps will be to rearrange Sk{Read,Write}Buffer members into disjoint strategies to handle typefaces and flattenable factories: one for in-process, one for cross-process, one when validating. BUG=skia: R=reed@google.com, scroggo@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/138803005 git-svn-id: http://skia.googlecode.com/svn/trunk@13253 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkWriteBuffer.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/core/SkWriteBuffer.h b/include/core/SkWriteBuffer.h index ab56f9d48d..332dfaea40 100644 --- a/include/core/SkWriteBuffer.h +++ b/include/core/SkWriteBuffer.h @@ -24,18 +24,15 @@ class SkRefCntSet; class SkWriteBuffer { public: - SkWriteBuffer(); - SkWriteBuffer(void* initialStorage, size_t storageSize); - ~SkWriteBuffer(); - enum Flags { kCrossProcess_Flag = 1 << 0, kValidation_Flag = 1 << 1, }; - void setFlags(uint32_t flags) { fFlags = flags; } - uint32_t getFlags() const { return fFlags; } - bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); } + SkWriteBuffer(uint32_t flags = 0); + SkWriteBuffer(void* initialStorage, size_t storageSize, uint32_t flags = 0); + ~SkWriteBuffer(); + bool isCrossProcess() const { return this->isValidating() || SkToBool(fFlags & kCrossProcess_Flag); } @@ -107,7 +104,9 @@ public: void setBitmapEncoder(SkPicture::EncodeBitmap bitmapEncoder); private: - uint32_t fFlags; + bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); } + + const uint32_t fFlags; SkFactorySet* fFactorySet; SkNamedFactorySet* fNamedFactorySet; SkWriter32 fWriter; -- cgit v1.2.3