Sanitizing source files in Skia_Periodic_House_Keeping

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

diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp
index f731ed775a4905c0b8773bf5e323df8684f496d8..84893975516caee0714031e4e7ae6b10fe8bd4f1 100644 (file)
--- a/debugger/SkDrawCommand.cpp
+++ b/debugger/SkDrawCommand.cpp
@@ -498,7 +498,7 @@ void DrawTextC::execute(SkCanvas* canvas) {
 }
 
 DrawTextOnPath::DrawTextOnPath(const void* text, size_t byteLength,
-                               const SkPath& path, const SkMatrix* matrix, 
+                               const SkPath& path, const SkMatrix* matrix,
                                const SkPaint& paint) {
     fText = new char[byteLength];
     memcpy(fText, text, byteLength);
@@ -527,8 +527,8 @@ void DrawTextOnPath::execute(SkCanvas* canvas) {
 }
 
 DrawVertices::DrawVertices(SkCanvas::VertexMode vmode, int vertexCount,
-                           const SkPoint vertices[], const SkPoint texs[], 
-                           const SkColor colors[], SkXfermode* xfermode, 
+                           const SkPoint vertices[], const SkPoint texs[],
+                           const SkColor colors[], SkXfermode* xfermode,
                            const uint16_t indices[], int indexCount,
                            const SkPaint& paint) {
     fVmode = vmode;

diff --git a/debugger/SkDrawCommand.h b/debugger/SkDrawCommand.h
index 7412c1d7bf484f48492bc8e964ba7415f127d7c8..65e1f0df014fd772d3301cbcf557f9c82e4394b3 100644 (file)
--- a/debugger/SkDrawCommand.h
+++ b/debugger/SkDrawCommand.h
@@ -407,8 +407,8 @@ private:
 class DrawVertices : public SkDrawCommand {
 public:
     DrawVertices(SkCanvas::VertexMode vmode, int vertexCount,
-                const SkPoint vertices[], const SkPoint texs[], 
-                const SkColor colors[], SkXfermode* xfermode, 
+                const SkPoint vertices[], const SkPoint texs[],
+                const SkColor colors[], SkXfermode* xfermode,
                 const uint16_t indices[], int indexCount,
                 const SkPaint& paint);
     virtual ~DrawVertices();

diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h
index 43aef909bdb2374edba2611e57572910d7112881..317923f344fb3b5438905ffc41165886c8a9e6ed 100644 (file)
--- a/include/core/SkFontHost.h
+++ b/include/core/SkFontHost.h
@@ -92,7 +92,7 @@ public:
     static LCDOrder GetSubpixelOrder();
 
 private:
-    
+
     /**
      *  DEPRECATED -- will be DESTROYED
      *

diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h
index 8f1c4a6eeb2c312d7c325ec60c108ae92ac3f973..cada6fa7e6655c136eae65680dfd43dabe46cadc 100644 (file)
--- a/include/ports/SkFontMgr.h
+++ b/include/ports/SkFontMgr.h
@@ -79,11 +79,11 @@ protected:
     virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) = 0;
     virtual SkTypeface* onCreateFromStream(SkStream*, int ttcIndex) = 0;
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) = 0;
-    
+
 private:
     static SkFontMgr* Factory();    // implemented by porting layer
     static SkMutex* Mutex();        // implemented by porting layer
-    
+
     typedef SkRefCnt INHERITED;
 };
 

diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 776a24af42cdba8c9e8b53f061c21ca4fd065a71..6af0ae388f079264b4cc6a5e15accdc55f4cee09 100644 (file)
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -198,4 +198,3 @@ size_t SkTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
         ? SkFontStream::GetTableData(stream, ttcIndex, tag, offset, length, data)
         : 0;
 }
-

diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index d263d40de048d2d6c0ca27a54386f953cf627b2c..64576afb7d50183223d7aad43c814397a9c68939 100644 (file)
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -690,7 +690,7 @@ void GrDrawTargetCaps::reset() {
     fHWAALineSupport = false;
     fShaderDerivativeSupport = false;
     fGeometryShaderSupport = false;
-    fDualSourceBlendingSupport = false; 
+    fDualSourceBlendingSupport = false;
     fBufferLockSupport = false;
     fPathStencilingSupport = false;
 

diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index bfe24f078d002e395c46347ddaeb5aad9a70f57b..4955057b5599ce82a8f4205ff50f0f41394ae3b6 100644 (file)
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -230,4 +230,3 @@ void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
     desc->setFamilyName(this->getFamilyName());
     *isLocalStream = SkToBool(this->getLocalStream());
 }
-

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 8999e8c972a4a73190b40a6f9a481a59d03e9275..ec8aafd75afb71bd7eacab3af58cc089afa2fb4d 100755 (executable)
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -1853,17 +1853,17 @@ protected:
     virtual SkFontStyleSet* onCreateStyleSet(int index) SK_OVERRIDE {
         return NULL;
     }
-    
+
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
                                            const SkFontStyle&) SK_OVERRIDE {
         return NULL;
     }
-    
+
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
                                          const SkFontStyle&) SK_OVERRIDE {
         return NULL;
     }
-    
+
     virtual SkTypeface* onCreateFromData(SkData* data,
                                          int ttcIndex) SK_OVERRIDE {
         AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data));

diff --git a/src/utils/mac/SkStream_mac.cpp b/src/utils/mac/SkStream_mac.cpp
index 62b7622d85575d9d03659677749e7ea0b98f7347..64d2dbb2cae1767d1195487601145e5cb6638ab9 100644 (file)
--- a/src/utils/mac/SkStream_mac.cpp
+++ b/src/utils/mac/SkStream_mac.cpp
@@ -38,14 +38,14 @@ static void release_info_proc(void* info) {
 
 CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
     stream->ref();  // unref will be called when the provider is deleted
-    
+
     const void* addr = stream->getMemoryBase();
     if (addr) {
         // special-case when the stream is just a block of ram
         return CGDataProviderCreateWithData(stream, addr, stream->getLength(),
                                             unref_proc);
     }
-    
+
     CGDataProviderSequentialCallbacks rec;
     sk_bzero(&rec, sizeof(rec));
     rec.version = 0;
@@ -65,4 +65,3 @@ CGDataProviderRef SkCreateDataProviderFromData(SkData* data) {
     return CGDataProviderCreateWithData(data, data->data(), data->size(),
                                             unref_proc);
 }
-