Sanitizing source files in Housekeeper-Nightly

git-svn-id: http://skia.googlecode.com/svn/trunk@13228 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/gpu/GrDistanceFieldTextContext.h b/include/gpu/GrDistanceFieldTextContext.h
index 79058b8..172342a 100755 (executable)
--- a/include/gpu/GrDistanceFieldTextContext.h
+++ b/include/gpu/GrDistanceFieldTextContext.h
@@ -23,7 +23,7 @@ public:
                              int scalarsPerPosition) SK_OVERRIDE;
 
 private:
-    GrDistanceFieldTextContext(GrContext*, const GrPaint&, const SkPaint&, 
+    GrDistanceFieldTextContext(GrContext*, const GrPaint&, const SkPaint&,
                                const SkDeviceProperties&);
     virtual ~GrDistanceFieldTextContext();
     friend class GrTTextContextManager<GrDistanceFieldTextContext>;

diff --git a/include/gpu/GrTextContext.h b/include/gpu/GrTextContext.h
index a8c0df0..273e094 100644 (file)
--- a/include/gpu/GrTextContext.h
+++ b/include/gpu/GrTextContext.h
@@ -36,7 +36,7 @@ protected:
     static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache);
     static void MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
                             const char text[], size_t byteLength, SkVector* stopVector);
-    
+
     GrContext*         fContext;
     GrPaint            fPaint;
     SkPaint            fSkPaint;
@@ -99,7 +99,7 @@ public:
     }
 
     virtual GrTextContext* create(GrContext* grContext, const GrPaint& grPaint,
-                                  const SkPaint& skPaint, const SkDeviceProperties& properties) 
+                                  const SkPaint& skPaint, const SkDeviceProperties& properties)
                                  SK_OVERRIDE {
         // add check for usePath here?
         SkASSERT(!fUsed);

diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index da887a5..ff81b2d 100755 (executable)
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -28,9 +28,9 @@ static const int kGlyphCoordsAttributeIndex = 1;
 SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
                 "Dump the contents of the font cache before every purge.");
 
-GrBitmapTextContext::GrBitmapTextContext(GrContext* context, 
+GrBitmapTextContext::GrBitmapTextContext(GrContext* context,
                                          const GrPaint& grPaint,
-                                         const SkPaint& skPaint, 
+                                         const SkPaint& skPaint,
                                          const SkDeviceProperties& properties)
                                        : GrTextContext(context, grPaint, skPaint, properties) {
     fStrike = NULL;
@@ -175,10 +175,10 @@ void GrBitmapTextContext::drawText(const char text[], size_t byteLength,
 
     SkFixed fx = SkScalarToFixed(x) + halfSampleX;
     SkFixed fy = SkScalarToFixed(y) + halfSampleY;
-    
+
     GrContext::AutoMatrix  autoMatrix;
     autoMatrix.setIdentity(fContext, &fPaint);
-    
+
     while (text < stop) {
         const SkGlyph& glyph = glyphCacheProc(cache, &text, fx & fxMask, fy & fyMask);
 

diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index afb203a..505ee39 100755 (executable)
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -26,9 +26,9 @@ static const int kBaseDFFontSize = 32;
 SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
                 "Dump the contents of the font cache before every purge.");
 
-GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context, 
+GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context,
                                                        const GrPaint& grPaint,
-                                                       const SkPaint& skPaint, 
+                                                       const SkPaint& skPaint,
                                                        const SkDeviceProperties& properties)
                                             : GrTextContext(context, grPaint, skPaint, properties) {
     fStrike = NULL;
@@ -293,7 +293,7 @@ void GrDistanceFieldTextContext::drawText(const char text[], size_t byteLength,
         || fSkPaint.getRasterizer()) {
         return;
     }
-    
+
     SkScalar sizeRatio = fTextRatio;
 
     SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
@@ -301,7 +301,7 @@ void GrDistanceFieldTextContext::drawText(const char text[], size_t byteLength,
     SkAutoGlyphCache    autoCache(fSkPaint, &fDeviceProperties, NULL);
     SkGlyphCache*       cache = autoCache.getCache();
     GrFontScaler*       fontScaler = GetGrFontScaler(cache);
-    
+
     // need to measure first
     // TODO - generate positions and pre-load cache as well?
     const char* stop = text + byteLength;
@@ -370,7 +370,7 @@ void GrDistanceFieldTextContext::drawPosText(const char text[], size_t byteLengt
     SkAutoGlyphCache    autoCache(fSkPaint, &fDeviceProperties, NULL);
     SkGlyphCache*       cache = autoCache.getCache();
     GrFontScaler*       fontScaler = GetGrFontScaler(cache);
-    
+
     const char*        stop = text + byteLength;
 
     if (SkPaint::kLeft_Align == fSkPaint.getTextAlign()) {

diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index ab9ef85..0c9e149 100644 (file)
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -13,7 +13,7 @@
 #include "SkGr.h"
 
 GrTextContext::GrTextContext(GrContext* context, const GrPaint& paint,
-                             const SkPaint& skPaint, const SkDeviceProperties& properties) : 
+                             const SkPaint& skPaint, const SkDeviceProperties& properties) :
                             fContext(context), fPaint(paint), fSkPaint(skPaint),
                             fDeviceProperties(properties) {
 
@@ -37,19 +37,19 @@ void GrTextContext::MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheP
                                 const char text[], size_t byteLength, SkVector* stopVector) {
     SkFixed     x = 0, y = 0;
     const char* stop = text + byteLength;
-    
+
     SkAutoKern  autokern;
-    
+
     while (text < stop) {
         // don't need x, y here, since all subpixel variants will have the
         // same advance
         const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-        
+
         x += autokern.adjust(glyph) + glyph.fAdvanceX;
         y += glyph.fAdvanceY;
     }
     stopVector->set(SkFixedToScalar(x), SkFixedToScalar(y));
-    
+
     SkASSERT(text == stop);
 }
 
@@ -61,7 +61,7 @@ static void GlyphCacheAuxProc(void* data) {
 GrFontScaler* GrTextContext::GetGrFontScaler(SkGlyphCache* cache) {
     void* auxData;
     GrFontScaler* scaler = NULL;
-    
+
     if (cache->getAuxProcData(GlyphCacheAuxProc, &auxData)) {
         scaler = (GrFontScaler*)auxData;
     }
@@ -69,7 +69,6 @@ GrFontScaler* GrTextContext::GetGrFontScaler(SkGlyphCache* cache) {
         scaler = SkNEW_ARGS(SkGrFontScaler, (cache));
         cache->setAuxProc(GlyphCacheAuxProc, scaler);
     }
-    
+
     return scaler;
 }
-

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index f52385a..df302c4 100644 (file)
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1781,7 +1781,7 @@ void SkGpuDevice::drawText(const SkDraw& draw, const void* text,
 
         SkDEBUGCODE(this->validate();)
 
-        SkAutoTDelete<GrTextContext> ctx(fTextContextManager->create(this->context(), 
+        SkAutoTDelete<GrTextContext> ctx(fTextContextManager->create(this->context(),
                                                                      grPaint, paint,
                                                                      this->getDeviceProperties()));
         ctx->drawText((const char *)text, byteLength, x, y);
@@ -1806,7 +1806,7 @@ void SkGpuDevice::drawPosText(const SkDraw& draw, const void* text,
 
         SkDEBUGCODE(this->validate();)
 
-        SkAutoTDelete<GrTextContext> ctx(fTextContextManager->create(this->context(), 
+        SkAutoTDelete<GrTextContext> ctx(fTextContextManager->create(this->context(),
                                                                      grPaint, paint,
                                                                      this->getDeviceProperties()));
         ctx->drawPosText((const char *)text, byteLength, pos, constY, scalarsPerPos);

diff --git a/src/opts/SkBitmapProcState_matrix_neon.h b/src/opts/SkBitmapProcState_matrix_neon.h
index bc1b59f..aab9dbc 100644 (file)
--- a/src/opts/SkBitmapProcState_matrix_neon.h
+++ b/src/opts/SkBitmapProcState_matrix_neon.h
@@ -501,4 +501,3 @@ const SkBitmapProcState::MatrixProc MAKENAME(_Procs)[] = {
 
 #undef TILEX_LOW_BITS
 #undef TILEY_LOW_BITS
-