Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10299 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index f880a86..ab3baba 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -145,7 +145,7 @@
SkScalar invScaleX = fInvMatrix.getScaleX();
SkScalar invScaleY = fInvMatrix.getScaleY();
-
+
SkASSERT(NULL == fScaledCacheID);
fScaledCacheID = SkScaledImageCache::FindAndLock(fOrigBitmap,
invScaleX, invScaleY,
@@ -250,7 +250,7 @@
SkDELETE(fBitmapFilter);
fBitmapFilter = NULL;
fScaledBitmap.reset();
-
+
if (fScaledCacheID) {
SkScaledImageCache::Unlock(fScaledCacheID);
fScaledCacheID = NULL;
diff --git a/src/core/SkScaledImageCache.cpp b/src/core/SkScaledImageCache.cpp
index 993b81b..8d7b81b 100644
--- a/src/core/SkScaledImageCache.cpp
+++ b/src/core/SkScaledImageCache.cpp
@@ -17,26 +17,26 @@
// Implemented from en.wikipedia.org/wiki/MurmurHash.
static uint32_t compute_hash(const uint32_t data[], int count) {
uint32_t hash = 0;
-
+
for (int i = 0; i < count; ++i) {
uint32_t k = data[i];
k *= 0xcc9e2d51;
k = (k << 15) | (k >> 17);
k *= 0x1b873593;
-
+
hash ^= k;
hash = (hash << 13) | (hash >> 19);
hash *= 5;
hash += 0xe6546b64;
}
-
+
// hash ^= size;
hash ^= hash >> 16;
hash *= 0x85ebca6b;
hash ^= hash >> 13;
hash *= 0xc2b2ae35;
hash ^= hash >> 16;
-
+
return hash;
}
#else
@@ -46,7 +46,7 @@
static uint32_t compute_hash(const uint32_t data[], int count) {
uint32_t hash = 0;
-
+
for (int i = 0; i < count; ++i) {
hash = mix(hash, data[i]);
}
@@ -219,7 +219,7 @@
void SkScaledImageCache::purgeAsNeeded() {
size_t byteLimit = fByteLimit;
size_t bytesUsed = fBytesUsed;
-
+
Rec* rec = fTail;
while (rec) {
if (bytesUsed < byteLimit) {
@@ -254,20 +254,20 @@
void SkScaledImageCache::detach(Rec* rec) {
Rec* prev = rec->fPrev;
Rec* next = rec->fNext;
-
+
if (!prev) {
SkASSERT(fHead == rec);
fHead = next;
} else {
prev->fNext = next;
}
-
+
if (!next) {
fTail = prev;
} else {
next->fPrev = prev;
}
-
+
rec->fNext = rec->fPrev = NULL;
}
@@ -286,7 +286,7 @@
fHead->fPrev = rec;
rec->fNext = fHead;
fHead = rec;
-
+
this->validate();
}
@@ -347,7 +347,7 @@
used -= rec->bytesUsed();
rec = rec->fPrev;
}
-
+
SkASSERT(0 == count);
SkASSERT(0 == used);
}
@@ -418,4 +418,3 @@
size_t SkGraphics::SetImageCacheByteLimit(size_t newLimit) {
return SkScaledImageCache::SetByteLimit(newLimit);
}
-
diff --git a/src/core/SkScaledImageCache.h b/src/core/SkScaledImageCache.h
index 6802043..3d85ce3 100644
--- a/src/core/SkScaledImageCache.h
+++ b/src/core/SkScaledImageCache.h
@@ -45,7 +45,7 @@
SkScaledImageCache(size_t byteLimit);
~SkScaledImageCache();
-
+
/**
* Search the cache for a scaled version of original. If found, return it
* in scaled, and return its ID pointer. Use the returned ptr to unlock
@@ -74,7 +74,7 @@
size_t getBytesUsed() const { return fBytesUsed; }
size_t getByteLimit() const { return fByteLimit; }
-
+
/**
* Set the maximum number of bytes available to this cache. If the current
* cache exceeds this new value, it will be purged to try to fit within
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp
index 4ff1c92..ca4a12c 100644
--- a/src/image/SkImagePriv.cpp
+++ b/src/image/SkImagePriv.cpp
@@ -143,8 +143,8 @@
}
void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture,
- const SkRect* src, const SkRect& dst, const SkPaint* paint) {
- int saveCount = canvas->getSaveCount();
+ const SkRect* src, const SkRect& dst, const SkPaint* paint) {
+ int saveCount = canvas->getSaveCount();
SkMatrix matrix;
SkRect tmpSrc;
@@ -167,7 +167,7 @@
if (!paint || !needs_layer(*paint)) {
canvas->clipRect(tmpSrc);
}
-
+
canvas->drawPicture(*picture);
canvas->restoreToCount(saveCount);
}
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 431444d..7bd1f7e 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -15,7 +15,7 @@
SkImage_Base(int width, int height) : INHERITED(width, height) {}
virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) = 0;
- virtual void onDrawRectToRect(SkCanvas*, const SkRect* src,
+ virtual void onDrawRectToRect(SkCanvas*, const SkRect* src,
const SkRect& dst, const SkPaint*) = 0;
virtual GrTexture* onGetTexture() { return NULL; }
diff --git a/src/image/SkImage_Codec.cpp b/src/image/SkImage_Codec.cpp
index b9a8990..64f58a6 100644
--- a/src/image/SkImage_Codec.cpp
+++ b/src/image/SkImage_Codec.cpp
@@ -49,7 +49,7 @@
canvas->drawBitmap(fBitmap, x, y, paint);
}
-void SkImage_Codec::onDrawRectToRect(SkCanvas* canvas, const SkRect* src,
+void SkImage_Codec::onDrawRectToRect(SkCanvas* canvas, const SkRect* src,
const SkRect& dst, const SkPaint* paint) {
if (!fBitmap.pixelRef()) {
if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->size(),