diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkDevice.cpp | 1 | ||||
-rw-r--r-- | src/core/SkOffsetTable.h | 16 | ||||
-rw-r--r-- | src/core/SkPathHeap.cpp | 4 | ||||
-rw-r--r-- | src/core/SkPathHeap.h | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index 6087cd2a14..b9c923cf58 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -193,4 +193,3 @@ bool SkBaseDevice::onWritePixels(const SkImageInfo&, const void*, size_t, int, i #ifdef SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG void SkBaseDevice::writePixels(const SkBitmap&, int x, int y, SkCanvas::Config8888) {} #endif - diff --git a/src/core/SkOffsetTable.h b/src/core/SkOffsetTable.h index 60c62642b2..0596c38f83 100644 --- a/src/core/SkOffsetTable.h +++ b/src/core/SkOffsetTable.h @@ -44,10 +44,10 @@ public: } int numIDs() const { - return fOffsetArrays.count(); + return fOffsetArrays.count(); } - // Do the offsets of any commands referencing this ID fall in the + // Do the offsets of any commands referencing this ID fall in the // range [min, max] (both inclusive) bool overlap(int id, size_t min, size_t max) { SkASSERT(id < fOffsetArrays.count()); @@ -87,17 +87,17 @@ public: protected: class OffsetArray { public: - void add(size_t offset) { + void add(size_t offset) { SkASSERT(fOffsets.count() == 0 || offset > this->max()); - *fOffsets.append() = offset; + *fOffsets.append() = offset; } - size_t min() const { + size_t min() const { SkASSERT(fOffsets.count() > 0); - return fOffsets[0]; + return fOffsets[0]; } - size_t max() const { + size_t max() const { SkASSERT(fOffsets.count() > 0); - return fOffsets[fOffsets.count()-1]; + return fOffsets[fOffsets.count()-1]; } int count() const { return fOffsets.count(); diff --git a/src/core/SkPathHeap.cpp b/src/core/SkPathHeap.cpp index d71257d731..84ffb04b80 100644 --- a/src/core/SkPathHeap.cpp +++ b/src/core/SkPathHeap.cpp @@ -50,7 +50,7 @@ int SkPathHeap::append(const SkPath& path) { return fPaths.count(); } -SkPathHeap::LookupEntry::LookupEntry(const SkPath& path) +SkPathHeap::LookupEntry::LookupEntry(const SkPath& path) : fGenerationID(path.getGenerationID()), fStorageSlot(0) { } @@ -59,7 +59,7 @@ SkPathHeap::LookupEntry* SkPathHeap::addIfNotPresent(const SkPath& path) { int index = SkTSearch<const LookupEntry, LookupEntry::Less>( fLookupTable.begin(), fLookupTable.count(), - searchKey, + searchKey, sizeof(LookupEntry)); if (index < 0) { index = ~index; diff --git a/src/core/SkPathHeap.h b/src/core/SkPathHeap.h index 7fdcdd93e0..377d8d968b 100644 --- a/src/core/SkPathHeap.h +++ b/src/core/SkPathHeap.h @@ -63,7 +63,7 @@ private: private: uint32_t fGenerationID; // the SkPath's generation ID // the path's index in the heap + 1. It is 0 if the path is not yet in the heap. - int fStorageSlot; + int fStorageSlot; }; SkTDArray<LookupEntry> fLookupTable; |