diff options
author | 2012-08-23 18:09:54 +0000 | |
---|---|---|
committer | 2012-08-23 18:09:54 +0000 | |
commit | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (patch) | |
tree | d8b4815d15946c32ee9d254e932411e93be942bb /src/core/SkPictureFlat.h | |
parent | 2abed834789bb64c7da740df4c47efc142b7311a (diff) |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPictureFlat.h')
-rw-r--r-- | src/core/SkPictureFlat.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/SkPictureFlat.h b/src/core/SkPictureFlat.h index b4f0625631..75e6672a14 100644 --- a/src/core/SkPictureFlat.h +++ b/src/core/SkPictureFlat.h @@ -89,9 +89,9 @@ class SkTypefacePlayback { public: SkTypefacePlayback(); virtual ~SkTypefacePlayback(); - + int count() const { return fCount; } - + void reset(const SkRefCntSet*); void setCount(int count); @@ -100,7 +100,7 @@ public: void setupBuffer(SkOrderedReadBuffer& buffer) const { buffer.setTypefaceArray((SkTypeface**)fArray, fCount); } - + protected: int fCount; SkRefCnt** fArray; @@ -115,13 +115,13 @@ public: ~SkFactoryPlayback() { SkDELETE_ARRAY(fArray); } - + SkFlattenable::Factory* base() const { return fArray; } void setupBuffer(SkOrderedReadBuffer& buffer) const { buffer.setFactoryPlayback(fArray, fCount); } - + private: int fCount; SkFlattenable::Factory* fArray; @@ -283,7 +283,7 @@ public: SkASSERT(b_ptr < b->dataStop()); return (*a_ptr < *b_ptr) ? -1 : 1; } - + int index() const { return fIndex; } const void* data() const { return (const char*)this + sizeof(*this); } void* data() { return (char*)this + sizeof(*this); } @@ -491,21 +491,21 @@ private: } } - + SkFlatController * const fController; int fNextIndex; SkTDArray<const SkFlatData*> fData; const SkFlatData* findAndReturnFlat(const T& element) { SkFlatData* flat = SkFlatData::Create(fController, &element, fNextIndex, fFlattenProc); - + int hashIndex = ChecksumToHashIndex(flat->checksum()); const SkFlatData* candidate = fHash[hashIndex]; if (candidate && !SkFlatData::Compare(flat, candidate)) { fController->unalloc(flat); return candidate; } - + int index = SkTSearch<SkFlatData>((const SkFlatData**) fData.begin(), fData.count(), flat, sizeof(flat), &SkFlatData::Compare); @@ -514,7 +514,7 @@ private: fHash[hashIndex] = fData[index]; return fData[index]; } - + index = ~index; *fData.insert(index) = flat; SkASSERT(fData.count() == fNextIndex); @@ -523,7 +523,7 @@ private: fHash[hashIndex] = flat; return flat; } - + enum { // Determined by trying diff values on picture-recording benchmarks @@ -535,7 +535,7 @@ private: HASH_COUNT = 1 << HASH_BITS }; const SkFlatData* fHash[HASH_COUNT]; - + static int ChecksumToHashIndex(uint32_t checksum) { int n = checksum; if (HASH_BITS < 32) { @@ -548,7 +548,7 @@ private: n ^= n >> 4; } return n & HASH_MASK; - } + } }; /////////////////////////////////////////////////////////////////////////////// |