Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12685 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h
index ba0b953..a547ddb 100644
--- a/include/core/SkMallocPixelRef.h
+++ b/include/core/SkMallocPixelRef.h
@@ -44,7 +44,7 @@
*/
static SkMallocPixelRef* NewAllocate(const SkImageInfo& info,
size_t rowBytes, SkColorTable*);
-
+
void* getAddr() const { return fStorage; }
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef)
diff --git a/include/core/SkPathRef.h b/include/core/SkPathRef.h
index c55f549..5358420 100644
--- a/include/core/SkPathRef.h
+++ b/include/core/SkPathRef.h
@@ -79,12 +79,12 @@
* requisite points & weights.
* The return pointer points at the first new point (indexed normally [<i>]).
* If 'verb' is kConic_Verb, 'weights' will return a pointer to the
- * space for the conic weights (indexed normally).
+ * space for the conic weights (indexed normally).
*/
- SkPoint* growForRepeatedVerb(int /*SkPath::Verb*/ verb,
- int numVbs,
- SkScalar** weights = NULL) {
- return fPathRef->growForRepeatedVerb(verb, numVbs, weights);
+ SkPoint* growForRepeatedVerb(int /*SkPath::Verb*/ verb,
+ int numVbs,
+ SkScalar** weights = NULL) {
+ return fPathRef->growForRepeatedVerb(verb, numVbs, weights);
}
/**
@@ -353,8 +353,8 @@
}
/**
- * Increases the verb count by numVbs and point count by the required amount.
- * The new points are uninitialized. All the new verbs are set to the specified
+ * Increases the verb count by numVbs and point count by the required amount.
+ * The new points are uninitialized. All the new verbs are set to the specified
* verb. If 'verb' is kConic_Verb, 'weights' will return a pointer to the
* uninitialized conic weights.
*/
@@ -426,10 +426,10 @@
void setIsOval(bool isOval) { fIsOval = isOval; }
- SkPoint* getPoints() {
- SkDEBUGCODE(this->validate();)
+ SkPoint* getPoints() {
+ SkDEBUGCODE(this->validate();)
fIsOval = false;
- return fPoints;
+ return fPoints;
}
enum {
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 4369e5d..1a6c6f8 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -244,7 +244,7 @@
acquire a mutex for thread safety, so this method need not do that.
*/
virtual void* onLockPixels(SkColorTable**) = 0;
-
+
/**
* Called when the lock count goes from 1 to 0. The caller will have
* already acquire a mutex for thread safety, so this method need not do
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index b387795..d4c3a47 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -536,7 +536,7 @@
// SkDebugf("unsupported config for info %d\n", dst->config());
return false;
}
-
+
SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, dst->rowBytes(),
ctable);
if (NULL == pr) {
diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp
index 25337e7..9f9ffd8 100644
--- a/src/core/SkMallocPixelRef.cpp
+++ b/src/core/SkMallocPixelRef.cpp
@@ -17,7 +17,7 @@
{
return false;
}
-
+
// these seem like good checks, but currently we have (at least) tests
// that expect the pixelref to succeed even when there is a mismatch
// with colortables. fix?
@@ -98,7 +98,7 @@
fCTable = ctable;
fRB = rowBytes;
SkSafeRef(ctable);
-
+
this->setPreLocked(fStorage, fCTable);
}
diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp
index 0711e3f..69afcfe 100644
--- a/src/core/SkPathRef.cpp
+++ b/src/core/SkPathRef.cpp
@@ -288,8 +288,8 @@
SkDEBUGCODE(this->validate();)
}
-SkPoint* SkPathRef::growForRepeatedVerb(int /*SkPath::Verb*/ verb,
- int numVbs,
+SkPoint* SkPathRef::growForRepeatedVerb(int /*SkPath::Verb*/ verb,
+ int numVbs,
SkScalar** weights) {
// This value is just made-up for now. When count is 4, calling memset was much
// slower than just writing the loop. This seems odd, and hopefully in the
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index a413d04..c8d2896 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -255,7 +255,7 @@
info.fWidth = width;
info.fHeight = height;
info.fAlphaType = kPremul_SkAlphaType;
-
+
SkAutoTUnref<GrTexture> texture(fContext->createUncachedTexture(desc, NULL, 0));
if (NULL != texture) {
diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp
index ddd60ff..a068d8d 100644
--- a/src/gpu/SkGrPixelRef.cpp
+++ b/src/gpu/SkGrPixelRef.cpp
@@ -82,7 +82,7 @@
info.fWidth = desc.fWidth;
info.fHeight = desc.fHeight;
info.fAlphaType = kPremul_SkAlphaType;
-
+
GrTexture* dst = context->createUncachedTexture(desc, NULL, 0);
if (NULL == dst) {
return NULL;
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 448c18f..6559f74 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -317,12 +317,12 @@
SkBitmap invalidBitmap2;
invalidBitmap2.setConfig(info);
-
+
// Hack to force invalid, by making the pixelref smaller than its
// owning bitmap.
info.fWidth = 32;
info.fHeight = 1;
-
+
invalidBitmap2.setPixelRef(SkMallocPixelRef::NewAllocate(
info, invalidBitmap2.rowBytes(), NULL))->unref();