Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@11493 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp
index 9dd235c..faa3f89 100644
--- a/src/core/SkGlyphCache.cpp
+++ b/src/core/SkGlyphCache.cpp
@@ -419,9 +419,9 @@
if (newLimit < minLimit) {
newLimit = minLimit;
}
-
+
SkAutoMutexAcquire ac(fMutex);
-
+
size_t prevLimit = fCacheSizeLimit;
fCacheSizeLimit = newLimit;
this->internalPurge();
@@ -432,9 +432,9 @@
if (newCount < 0) {
newCount = 0;
}
-
+
SkAutoMutexAcquire ac(fMutex);
-
+
int prevCount = fCacheCountLimit;
fCacheCountLimit = newCount;
this->internalPurge();
@@ -618,7 +618,7 @@
cache->fNext = fHead;
}
fHead = cache;
-
+
fCacheCount += 1;
fTotalMemoryUsed += cache->fMemoryUsed;
}
@@ -660,14 +660,14 @@
void SkGlyphCache_Globals::validate() const {
size_t computedBytes = 0;
int computedCount = 0;
-
+
const SkGlyphCache* head = fHead;
while (head != NULL) {
computedBytes += head->fMemoryUsed;
computedCount += 1;
head = head->fNext;
}
-
+
SkASSERT(fTotalMemoryUsed == computedBytes);
SkASSERT(fCacheCount == computedCount);
}
diff --git a/src/core/SkGlyphCache_Globals.h b/src/core/SkGlyphCache_Globals.h
index 20b0f29..5066582 100644
--- a/src/core/SkGlyphCache_Globals.h
+++ b/src/core/SkGlyphCache_Globals.h
@@ -29,17 +29,17 @@
kNo_UseMutex, // thread-local cache
kYes_UseMutex // shared cache
};
-
+
SkGlyphCache_Globals(UseMutex um) {
fHead = NULL;
fTotalMemoryUsed = 0;
fCacheSizeLimit = SK_DEFAULT_FONT_CACHE_LIMIT;
fCacheCount = 0;
fCacheCountLimit = SK_DEFAULT_FONT_CACHE_COUNT_LIMIT;
-
+
fMutex = (kYes_UseMutex == um) ? SkNEW(SkMutex) : NULL;
}
-
+
~SkGlyphCache_Globals() {
SkGlyphCache* cache = fHead;
while (cache) {
@@ -47,10 +47,10 @@
SkDELETE(cache);
cache = next;
}
-
+
SkDELETE(fMutex);
}
-
+
SkMutex* fMutex;
SkGlyphCache* internalGetHead() const { return fHead; }
@@ -82,7 +82,7 @@
// call when a glyphcache is available for caching (i.e. not in use)
void attachCacheToHead(SkGlyphCache*);
-
+
// can only be called when the mutex is already held
void internalDetachCache(SkGlyphCache*);
void internalAttachCacheToHead(SkGlyphCache*);
@@ -91,20 +91,20 @@
static SkGlyphCache_Globals* FindTLS() {
return (SkGlyphCache_Globals*)SkTLS::Find(CreateTLS);
}
-
+
static SkGlyphCache_Globals& GetTLS() {
return *(SkGlyphCache_Globals*)SkTLS::Get(CreateTLS, DeleteTLS);
}
-
+
static void DeleteTLS() { SkTLS::Delete(CreateTLS); }
-
+
private:
SkGlyphCache* fHead;
size_t fTotalMemoryUsed;
size_t fCacheSizeLimit;
int32_t fCacheCountLimit;
int32_t fCacheCount;
-
+
// Checkout budgets, modulated by the specified min-bytes-needed-to-purge,
// and attempt to purge caches to match.
// Returns number of bytes freed.
@@ -113,7 +113,7 @@
static void* CreateTLS() {
return SkNEW_ARGS(SkGlyphCache_Globals, (kNo_UseMutex));
}
-
+
static void DeleteTLS(void* ptr) {
SkDELETE((SkGlyphCache_Globals*)ptr);
}
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp
index f2c586d..a7374ad 100644
--- a/src/effects/SkTileImageFilter.cpp
+++ b/src/effects/SkTileImageFilter.cpp
@@ -43,7 +43,7 @@
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
- SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset,
+ SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset,
SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode));
paint.setShader(shader);
SkRect dstRect = fDstRect;
@@ -63,4 +63,3 @@
buffer.writeRect(fSrcRect);
buffer.writeRect(fDstRect);
}
-