10 files changed, 12 insertions, 32 deletions
diff --git a/src/animator/SkDrawBlur.h b/src/animator/SkDrawBlur.h
index 0c916a382f..462a0413c4 100644
--- a/src/animator/SkDrawBlur.h
+++ b/src/animator/SkDrawBlur.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDrawBlur_DEFINED
 #define SkDrawBlur_DEFINED
 
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkBlurMaskFilter.h"
 
 class SkDrawBlur : public SkDrawMaskFilter {
diff --git a/src/animator/SkDrawColor.h b/src/animator/SkDrawColor.h
index 281af0fb51..17d1eef319 100644
--- a/src/animator/SkDrawColor.h
+++ b/src/animator/SkDrawColor.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDrawColor_DEFINED
 #define SkDrawColor_DEFINED
 
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkColor.h"
 
 class SkDrawColor : public SkPaintPart {
diff --git a/src/animator/SkDrawDash.h b/src/animator/SkDrawDash.h
index 0000462ba7..fafc4b07e2 100644
--- a/src/animator/SkDrawDash.h
+++ b/src/animator/SkDrawDash.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDrawDash_DEFINED
 #define SkDrawDash_DEFINED
 
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkIntArray.h"
 
 class SkDash : public SkDrawPathEffect {
diff --git a/src/animator/SkDrawDiscrete.h b/src/animator/SkDrawDiscrete.h
index bd33d2fcd7..d0f9239c4c 100644
--- a/src/animator/SkDrawDiscrete.h
+++ b/src/animator/SkDrawDiscrete.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDrawDiscrete_DEFINED
 #define SkDrawDiscrete_DEFINED
 
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 
 class SkDiscrete : public SkDrawPathEffect {
     DECLARE_MEMBER_INFO(Discrete);
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp
index 4b911d11c4..007fb5263b 100644
--- a/src/animator/SkDrawExtraPathEffect.cpp
+++ b/src/animator/SkDrawExtraPathEffect.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,13 +5,12 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkDrawExtraPathEffect.h"
 #include "SkDrawPath.h"
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkMemberInfo.h"
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkPathEffect.h"
 #include "SkCornerPathEffect.h"
 
diff --git a/src/animator/SkDrawPaint.cpp b/src/animator/SkDrawPaint.cpp
index 825d0486a7..c882427585 100644
--- a/src/animator/SkDrawPaint.cpp
+++ b/src/animator/SkDrawPaint.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,13 +5,12 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkDrawPaint.h"
 #include "SkAnimateMaker.h"
 #include "SkDrawColor.h"
 #include "SkDrawShader.h"
 #include "SkMaskFilter.h"
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkPathEffect.h"
 
 enum SkPaint_Functions {
diff --git a/src/animator/SkDrawShader.h b/src/animator/SkDrawShader.h
index b6a487acdb..2c46e07788 100644
--- a/src/animator/SkDrawShader.h
+++ b/src/animator/SkDrawShader.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDrawShader_DEFINED
 #define SkDrawShader_DEFINED
 
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkShader.h"
 
 class SkBaseBitmap;
diff --git a/src/animator/SkDrawTransparentShader.h b/src/animator/SkDrawTransparentShader.h
index bf6617403e..e0f61edf93 100644
--- a/src/animator/SkDrawTransparentShader.h
+++ b/src/animator/SkDrawTransparentShader.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDrawTransparentShader_DEFINED
 #define SkDrawTransparentShader_DEFINED
 
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 
 class SkDrawTransparentShader : public SkDrawShader {
     DECLARE_EMPTY_MEMBER_INFO(TransparentShader);
diff --git a/src/animator/SkPaintParts.cpp b/src/animator/SkPaintPart.cpp
index 22119a4ff9..285b564c93 100644
--- a/src/animator/SkPaintParts.cpp
+++ b/src/animator/SkPaintPart.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,8 +5,7 @@
  * found in the LICENSE file.
  */
 
-
-#include "SkPaintParts.h"
+#include "SkPaintPart.h"
 #include "SkDrawPaint.h"
 #ifdef SK_DUMP_ENABLED
 #include "SkDisplayList.h"
diff --git a/src/animator/SkPaintParts.h b/src/animator/SkPaintPart.h
index 964bc359b0..a6154e5da6 100644
--- a/src/animator/SkPaintParts.h
+++ b/src/animator/SkPaintPart.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,9 +5,8 @@
  * found in the LICENSE file.
  */
 
-
-#ifndef SkPaintParts_DEFINED
-#define SkPaintParts_DEFINED
+#ifndef SkPaintPart_DEFINED
+#define SkPaintPart_DEFINED
 
 #include "SkDisplayable.h"
 #include "SkMemberInfo.h"
@@ -72,4 +70,4 @@ protected:
     SkTypeface::Style style;
 };
 
-#endif // SkPaintParts_DEFINED
+#endif // SkPaintPart_DEFINED