Skotty -> Skottie

Change-Id: If8b6516024c69b0fc256208874f6666a4e70e12c
Reviewed-on: https://skia-review.googlesource.com/95241
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

8 files changed, 36 insertions, 36 deletions

diff --git a/experimental/skotty/Skotty.cpp b/experimental/skottie/Skottie.cpp
index 72d12d6ac4..f8c5ea021c 100644
--- a/experimental/skotty/Skotty.cpp
+++ b/experimental/skottie/Skottie.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Skotty.h"
+#include "Skottie.h"
 
 #include "SkCanvas.h"
-#include "SkottyAnimator.h"
-#include "SkottyPriv.h"
-#include "SkottyProperties.h"
+#include "SkottieAnimator.h"
+#include "SkottiePriv.h"
+#include "SkottieProperties.h"
 #include "SkData.h"
 #include "SkImage.h"
 #include "SkMakeUnique.h"
@@ -42,7 +42,7 @@
 
 #include "stdlib.h"
 
-namespace skotty {
+namespace skottie {
 
 namespace {
 
@@ -1048,4 +1048,4 @@ void Animation::animationTick(SkMSec ms) {
     }
 }
 
-} // namespace skotty
+} // namespace skottie
diff --git a/experimental/skotty/Skotty.h b/experimental/skottie/Skottie.h
index ebd103d60c..e13bd0ae98 100644
--- a/experimental/skotty/Skotty.h
+++ b/experimental/skottie/Skottie.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef Skotty_DEFINED
-#define Skotty_DEFINED
+#ifndef Skottie_DEFINED
+#define Skottie_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkSize.h"
@@ -25,7 +25,7 @@ namespace Json { class Value; }
 
 namespace sksg { class RenderNode;  }
 
-namespace skotty {
+namespace skottie {
 
 class AnimatorBase;
 
@@ -75,6 +75,6 @@ private:
     typedef SkNoncopyable INHERITED;
 };
 
-} // namespace skotty
+} // namespace skottie
 
-#endif // Skotty_DEFINED
+#endif // Skottie_DEFINED
diff --git a/experimental/skotty/SkottyAnimator.cpp b/experimental/skottie/SkottieAnimator.cpp
index 698e961b64..296a96b1fd 100644
--- a/experimental/skotty/SkottyAnimator.cpp
+++ b/experimental/skottie/SkottieAnimator.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "SkottyAnimator.h"
+#include "SkottieAnimator.h"
 
-namespace skotty {
+namespace skottie {
 
 namespace {
 
@@ -91,4 +91,4 @@ void KeyframeInterval<ShapeValue>::lerp(float t, ShapeValue* v) const {
     v->setIsVolatile(true);
 }
 
-} // namespace skotty
+} // namespace skottie
diff --git a/experimental/skotty/SkottyAnimator.h b/experimental/skottie/SkottieAnimator.h
index f21704a3d8..4e63e12833 100644
--- a/experimental/skotty/SkottyAnimator.h
+++ b/experimental/skottie/SkottieAnimator.h
@@ -5,19 +5,19 @@
  * found in the LICENSE file.
  */
 
-#ifndef SkottyAnimator_DEFINED
-#define SkottyAnimator_DEFINED
+#ifndef SkottieAnimator_DEFINED
+#define SkottieAnimator_DEFINED
 
 #include "SkCubicMap.h"
 #include "SkMakeUnique.h"
-#include "SkottyPriv.h"
-#include "SkottyProperties.h"
+#include "SkottiePriv.h"
+#include "SkottieProperties.h"
 #include "SkTypes.h"
 
 #include <memory>
 #include <vector>
 
-namespace skotty {
+namespace skottie {
 
 class AnimatorBase : public SkNoncopyable {
 public:
@@ -188,6 +188,6 @@ const KeyframeInterval<ValT>& Animator<ValT, NodeT>::findFrame(float t) const {
     return *f0;
 }
 
-} // namespace skotty
+} // namespace skottie
 
-#endif // SkottyAnimator_DEFINED
+#endif // SkottieAnimator_DEFINED
diff --git a/experimental/skotty/SkottyPriv.h b/experimental/skottie/SkottiePriv.h
index e39994100c..0d047c5d37 100644
--- a/experimental/skotty/SkottyPriv.h
+++ b/experimental/skottie/SkottiePriv.h
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#ifndef SkottyPriv_DEFINED
-#define SkottyPriv_DEFINED
+#ifndef SkottiePriv_DEFINED
+#define SkottiePriv_DEFINED
 
 #include "SkJSONCPP.h"
 #include "SkPoint.h"
 #include "SkScalar.h"
 #include "SkString.h"
 
-namespace skotty {
+namespace skottie {
 
 #define LOG SkDebugf
 
@@ -46,4 +46,4 @@ static inline SkPoint ParsePoint(const Json::Value& v, const SkPoint& defaultVal
 
 } // namespace
 
-#endif // SkottyPriv_DEFINED
+#endif // SkottiePriv_DEFINED
diff --git a/experimental/skotty/SkottyProperties.cpp b/experimental/skottie/SkottieProperties.cpp
index 6be2eebfa3..b9535c428c 100644
--- a/experimental/skotty/SkottyProperties.cpp
+++ b/experimental/skottie/SkottieProperties.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "SkottyProperties.h"
+#include "SkottieProperties.h"
 
 #include "SkColor.h"
-#include "SkottyPriv.h"
+#include "SkottiePriv.h"
 #include "SkPath.h"
 #include "SkSGColor.h"
 #include "SkSGGradient.h"
@@ -18,7 +18,7 @@
 
 #include <cmath>
 
-namespace  skotty {
+namespace  skottie {
 
 namespace {
 
@@ -287,4 +287,4 @@ void CompositeRadialGradient::onApply() {
     grad->setEndRadius(SkPoint::Distance(this->startPoint(), this->endPoint()));
 }
 
-} // namespace skotty
+} // namespace skottie
diff --git a/experimental/skotty/SkottyProperties.h b/experimental/skottie/SkottieProperties.h
index 177ba35873..c5e14d14cb 100644
--- a/experimental/skotty/SkottyProperties.h
+++ b/experimental/skottie/SkottieProperties.h
@@ -5,14 +5,14 @@
  * found in the LICENSE file.
  */
 
-#ifndef SkottyProperties_DEFINED
-#define SkottyProperties_DEFINED
+#ifndef SkottieProperties_DEFINED
+#define SkottieProperties_DEFINED
 
 #include "SkColor.h"
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkSize.h"
-#include "SkottyPriv.h"
+#include "SkottiePriv.h"
 #include "SkRefCnt.h"
 #include "SkTArray.h"
 #include "SkTypes.h"
@@ -31,7 +31,7 @@ class RRect;
 class RenderNode;;
 }
 
-namespace  skotty {
+namespace  skottie {
 
 template <typename T>
 struct ValueTraits {
@@ -163,6 +163,6 @@ private:
 
 #undef COMPOSITE_PROPERTY
 
-} // namespace skotty
+} // namespace skottie
 
-#endif // SkottyProperties_DEFINED
+#endif // SkottieProperties_DEFINED
diff --git a/experimental/sksg/geometry/SkSGMerge.cpp b/experimental/sksg/geometry/SkSGMerge.cpp
index a9f06d464f..f75945d85e 100644
--- a/experimental/sksg/geometry/SkSGMerge.cpp
+++ b/experimental/sksg/geometry/SkSGMerge.cpp
@@ -78,4 +78,4 @@ SkRect Merge::onRevalidate(InvalidationController* ic, const SkMatrix& ctm) {
     return fMerged.computeTightBounds();
 }
 
-} // namespace skotty
+} // namespace sksg