Sanitizing source files in Skia_Periodic_House_Keeping

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

19 files changed, 28 insertions, 28 deletions

diff --git a/experimental/Intersection/ShapeOps.cpp b/experimental/Intersection/ShapeOps.cpp
index 20b21f9cf0..826a190706 100644
--- a/experimental/Intersection/ShapeOps.cpp
+++ b/experimental/Intersection/ShapeOps.cpp
@@ -4,7 +4,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
- 
+
 #include "Simplify.h"
 
 namespace Op {
@@ -298,7 +298,7 @@ void operate(const SkPath& one, const SkPath& two, ShapeOp op, SkPath& result) {
         } while (addIntersectTs(current, next) && nextPtr != listEnd);
     } while (currentPtr != listEnd);
     // eat through coincident edges
-    
+
     int total = 0;
     int index;
     for (index = 0; index < contourList.count(); ++index) {
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index 44c95756f9..3f4adf5490 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -3392,7 +3392,7 @@ public:
             SkDebugf(" windValue=%d\n", fTs[i].fWindValue);
         }
     }
-    
+
     // This isn't useful yet -- but leaving it in for now in case i think of something
     // to use it for
     void validateActiveSpans() const {
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
index 4181519434..69f4c2f0d2 100644
--- a/src/core/SkBitmapProcState.h
+++ b/src/core/SkBitmapProcState.h
@@ -138,7 +138,7 @@ private:
     MatrixProc chooseMatrixProc(bool trivial_matrix);
     bool chooseProcs(const SkMatrix& inv, const SkPaint&);
     ShaderProc32 chooseShaderProc32();
-    
+
     // Return false if we failed to setup for fast translate (e.g. overflow)
     bool setupForTranslate();
 
diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp
index 36db3fdd2f..ebb44fb87f 100644
--- a/src/ports/SkFontHost_mac_coretext.cpp
+++ b/src/ports/SkFontHost_mac_coretext.cpp
@@ -1812,7 +1812,7 @@ void SkFontHost::FilterRec(SkScalerContext::Rec* rec, SkTypeface*) {
     rec->fFlags &= ~flagsWeDontSupport;
 
     bool lcdSupport = supports_LCD();
-    
+
     // Only two levels of hinting are supported.
     // kNo_Hinting means avoid CoreGraphics outline dilation.
     // kNormal_Hinting means CoreGraphics outline dilation is allowed.
diff --git a/src/sfnt/SkOTTable_OS_2.h b/src/sfnt/SkOTTable_OS_2.h
index b89c944b2a..c4dbc5336c 100644
--- a/src/sfnt/SkOTTable_OS_2.h
+++ b/src/sfnt/SkOTTable_OS_2.h
@@ -26,7 +26,7 @@ struct SkOTTableOS2 {
 
     union Version {
         SK_OT_USHORT version;
-        
+
         //original V0 TT
         struct VA : SkOTTableOS2_VA { } vA;
         struct V0 : SkOTTableOS2_V0 { } v0;
diff --git a/src/sfnt/SkOTTable_OS_2_V0.h b/src/sfnt/SkOTTable_OS_2_V0.h
index 26aa832f79..14d322f7ce 100644
--- a/src/sfnt/SkOTTable_OS_2_V0.h
+++ b/src/sfnt/SkOTTable_OS_2_V0.h
@@ -21,7 +21,7 @@ struct SkOTTableOS2_V0 {
     //SkOTTableOS2_VA::VERSION and SkOTTableOS2_V0::VERSION are both 0.
     //The only way to differentiate these two versions is by the size of the table.
     static const SK_OT_USHORT VERSION = SkTEndian_SwapBE16(0);
-    
+
     SK_OT_SHORT xAvgCharWidth;
     struct WeightClass {
         SK_TYPED_ENUM(Value, SK_OT_USHORT,
diff --git a/src/sfnt/SkOTTable_OS_2_V1.h b/src/sfnt/SkOTTable_OS_2_V1.h
index 5136071b2a..52a60c0a4d 100644
--- a/src/sfnt/SkOTTable_OS_2_V1.h
+++ b/src/sfnt/SkOTTable_OS_2_V1.h
@@ -19,7 +19,7 @@
 struct SkOTTableOS2_V1 {
     SK_OT_USHORT version;
     static const SK_OT_USHORT VERSION = SkTEndian_SwapBE16(1);
-    
+
     SK_OT_SHORT xAvgCharWidth;
     struct WeightClass {
         SK_TYPED_ENUM(Value, SK_OT_USHORT,
diff --git a/src/sfnt/SkOTTable_OS_2_V2.h b/src/sfnt/SkOTTable_OS_2_V2.h
index 69e8d6e9d8..4be2e199a6 100644
--- a/src/sfnt/SkOTTable_OS_2_V2.h
+++ b/src/sfnt/SkOTTable_OS_2_V2.h
@@ -19,7 +19,7 @@
 struct SkOTTableOS2_V2 {
     SK_OT_USHORT version;
     static const SK_OT_USHORT VERSION = SkTEndian_SwapBE16(2);
-    
+
     SK_OT_SHORT xAvgCharWidth;
     struct WeightClass {
         SK_TYPED_ENUM(Value, SK_OT_USHORT,
diff --git a/src/sfnt/SkOTTable_OS_2_V3.h b/src/sfnt/SkOTTable_OS_2_V3.h
index 710078b315..637eb378ad 100644
--- a/src/sfnt/SkOTTable_OS_2_V3.h
+++ b/src/sfnt/SkOTTable_OS_2_V3.h
@@ -19,7 +19,7 @@
 struct SkOTTableOS2_V3 {
     SK_OT_USHORT version;
     static const SK_OT_USHORT VERSION = SkTEndian_SwapBE16(3);
-    
+
     SK_OT_SHORT xAvgCharWidth;
     struct WeightClass {
         SK_TYPED_ENUM(Value, SK_OT_USHORT,
diff --git a/src/sfnt/SkOTTable_OS_2_V4.h b/src/sfnt/SkOTTable_OS_2_V4.h
index 48c6eb0907..fc6ed5daad 100644
--- a/src/sfnt/SkOTTable_OS_2_V4.h
+++ b/src/sfnt/SkOTTable_OS_2_V4.h
@@ -19,7 +19,7 @@
 struct SkOTTableOS2_V4 {
     SK_OT_USHORT version;
     static const SK_OT_USHORT VERSION = SkTEndian_SwapBE16(4);
-    
+
     SK_OT_SHORT xAvgCharWidth;
     struct WeightClass {
         SK_TYPED_ENUM(Value, SK_OT_USHORT,
diff --git a/src/sfnt/SkOTTable_OS_2_VA.h b/src/sfnt/SkOTTable_OS_2_VA.h
index a0d9a36593..146e83b67e 100644
--- a/src/sfnt/SkOTTable_OS_2_VA.h
+++ b/src/sfnt/SkOTTable_OS_2_VA.h
@@ -22,7 +22,7 @@ struct SkOTTableOS2_VA {
     //SkOTTableOS2_VA::VERSION and SkOTTableOS2_V0::VERSION are both 0.
     //The only way to differentiate these two versions is by the size of the table.
     static const SK_OT_USHORT VERSION = SkTEndian_SwapBE16(0);
-    
+
     SK_OT_SHORT xAvgCharWidth;
     struct WeightClass {
         SK_TYPED_ENUM(Value, SK_OT_USHORT,
diff --git a/src/sfnt/SkOTTable_glyf.h b/src/sfnt/SkOTTable_glyf.h
index c6741a2e9e..a52fd06fe6 100644
--- a/src/sfnt/SkOTTable_glyf.h
+++ b/src/sfnt/SkOTTable_glyf.h
@@ -26,7 +26,7 @@ struct SkOTTableGlyph {
     static const SK_OT_CHAR TAG2 = 'y';
     static const SK_OT_CHAR TAG3 = 'f';
     static const SK_OT_ULONG TAG = SkOTTableTAG<SkOTTableGlyph>::value;
-    
+
     class Iterator {
     public:
         Iterator(const SkOTTableGlyph& glyf,
@@ -36,7 +36,7 @@ struct SkOTTableGlyph {
         , fLocaFormat(SkOTTableHead::IndexToLocFormat::ShortOffsets == locaFormat.value ? 0 : 1)
         , fCurrentGlyphOffset(0)
         { fLocaPtr.shortOffset = reinterpret_cast<const SK_OT_USHORT*>(&loca); }
-        
+
         void advance(uint16_t num) {
             fLocaPtr.shortOffset += num << fLocaFormat;
             fCurrentGlyphOffset = fLocaFormat ? SkEndian_SwapBE32(*fLocaPtr.longOffset)
@@ -70,15 +70,15 @@ struct SkOTTableGlyphData {
     SK_OT_FWORD yMin;
     SK_OT_FWORD xMax;
     SK_OT_FWORD yMax;
-    
+
     struct Simple {
         SK_OT_USHORT endPtsOfContours[1/*numberOfContours*/];
-        
+
         struct Instructions {
             SK_OT_USHORT length;
             SK_OT_BYTE data[1/*length*/];
         };
-        
+
         union Flags {
             struct Field {
                 SK_OT_BYTE_BITFIELD(
@@ -101,11 +101,11 @@ struct SkOTTableGlyphData {
                 SK_OT_BYTE value;
             } raw;
         };
-        
+
         //xCoordinates
         //yCoordinates
     };
-    
+
     struct Composite {
         struct Component {
             union Flags {
@@ -140,7 +140,7 @@ struct SkOTTableGlyphData {
                     static const SK_OT_USHORT MORE_COMPONENTS_Mask = SkTEndian_SwapBE16(1 << 5);
                     static const SK_OT_USHORT WE_HAVE_AN_X_AND_Y_SCALE_Mask = SkTEndian_SwapBE16(1 << 6);
                     static const SK_OT_USHORT WE_HAVE_A_TWO_BY_TWO_Mask = SkTEndian_SwapBE16(1 << 7);
-                    
+
                     static const SK_OT_USHORT WE_HAVE_INSTRUCTIONS_Mask = SkTEndian_SwapBE16(1 << 8);
                     static const SK_OT_USHORT USE_MY_METRICS_Mask = SkTEndian_SwapBE16(1 << 9);
                     static const SK_OT_USHORT OVERLAP_COMPOUND_Mask = SkTEndian_SwapBE16(1 << 10);
@@ -200,7 +200,7 @@ struct SkOTTableGlyphData {
                 } byteIndex;
             } transform;
         } component;//[] last element does not set MORE_COMPONENTS
-        
+
         /** Comes after the last Component if the last component has WE_HAVE_INSTR. */
         struct Instructions {
             SK_OT_USHORT length;
diff --git a/src/sfnt/SkOTTable_loca.h b/src/sfnt/SkOTTable_loca.h
index 1d22b30c82..586daf1d4d 100644
--- a/src/sfnt/SkOTTable_loca.h
+++ b/src/sfnt/SkOTTable_loca.h
@@ -19,7 +19,7 @@ struct SkOTTableIndexToLocation {
     static const SK_OT_CHAR TAG2 = 'c';
     static const SK_OT_CHAR TAG3 = 'a';
     static const SK_OT_ULONG TAG = SkOTTableTAG<SkOTTableIndexToLocation>::value;
-    
+
     union Offsets {
         SK_OT_USHORT shortOffset[1];
         SK_OT_ULONG longOffset[1];
diff --git a/src/sfnt/SkOTTable_maxp.h b/src/sfnt/SkOTTable_maxp.h
index 3120cd4db2..d7feac6986 100644
--- a/src/sfnt/SkOTTable_maxp.h
+++ b/src/sfnt/SkOTTable_maxp.h
@@ -23,7 +23,7 @@ struct SkOTTableMaximumProfile {
 
     union Version {
         SK_OT_Fixed version;
-        
+
         struct CFF : SkOTTableMaximumProfile_CFF { } cff;
         struct TT : SkOTTableMaximumProfile_TT { } tt;
     } version;
diff --git a/src/sfnt/SkOTTable_maxp_CFF.h b/src/sfnt/SkOTTable_maxp_CFF.h
index da9f9c6f09..873fb66c9f 100644
--- a/src/sfnt/SkOTTable_maxp_CFF.h
+++ b/src/sfnt/SkOTTable_maxp_CFF.h
@@ -16,7 +16,7 @@
 struct SkOTTableMaximumProfile_CFF {
     SK_OT_Fixed version;
     static const SK_OT_Fixed VERSION = SkTEndian_SwapBE32(0x00005000);
-    
+
     SK_OT_USHORT numGlyphs;
 };
 
diff --git a/src/sfnt/SkOTTable_maxp_TT.h b/src/sfnt/SkOTTable_maxp_TT.h
index ac4dbf6777..ad472a1f16 100644
--- a/src/sfnt/SkOTTable_maxp_TT.h
+++ b/src/sfnt/SkOTTable_maxp_TT.h
@@ -17,7 +17,7 @@
 struct SkOTTableMaximumProfile_TT {
     SK_OT_Fixed version;
     static const SK_OT_Fixed VERSION = SkTEndian_SwapBE32(0x00010000);
-    
+
     SK_OT_USHORT numGlyphs;
     SK_OT_USHORT maxPoints;
     SK_OT_USHORT maxContours;
diff --git a/src/sfnt/SkOTUtils.cpp b/src/sfnt/SkOTUtils.cpp
index 4eeaa36d04..0247cdad26 100644
--- a/src/sfnt/SkOTUtils.cpp
+++ b/src/sfnt/SkOTUtils.cpp
@@ -20,7 +20,7 @@ extern const uint8_t SK_OT_GlyphData_NoOutline[] = {
     0x0,0x0, //SkOTTableGlyphData::yMin
     0x0,0x0, //SkOTTableGlyphData::xMax
     0x0,0x0, //SkOTTableGlyphData::yMax
-    
+
     0x0,0x0, //SkOTTableGlyphDataInstructions::length
 };
 
diff --git a/src/sfnt/SkSFNTHeader.h b/src/sfnt/SkSFNTHeader.h
index ee1659e355..9071696c99 100644
--- a/src/sfnt/SkSFNTHeader.h
+++ b/src/sfnt/SkSFNTHeader.h
@@ -52,7 +52,7 @@ struct SkSFNTHeader {
     SK_SFNT_USHORT searchRange;
     SK_SFNT_USHORT entrySelector;
     SK_SFNT_USHORT rangeShift;
-    
+
     struct TableDirectoryEntry {
         SK_SFNT_ULONG tag;
         SK_SFNT_ULONG checksum;
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index a6c481a136..ded1130be4 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -42,7 +42,7 @@ static void test_strokerect(skiatest::Reporter* reporter) {
         paint.getFillPath(path, &fillPath);
 
         REPORTER_ASSERT(reporter, equal(outer, fillPath.getBounds()));
-        
+
         bool isMiter = SkPaint::kMiter_Join == joins[i];
         SkRect nested[2];
         REPORTER_ASSERT(reporter, fillPath.isNestedRects(nested) == isMiter);