commit 54f65c473fd6bf6919dfcbad22e924dff7586568
author Florin Malita <fmalita@chromium.org> Tue Jan 16 17:04:30 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 17 14:15:36 2018 +0000
tree e241fc08b1dff9c41621bd52afca21c6059ed34b
parent d452434d1717aa42993a4c671ffc5625fe273957

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>

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index d0c4681..506d3fb5 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -61,7 +61,7 @@
 #endif
 
 #if !defined(SK_BUILD_FOR_GOOGLE3)
-    #include "Skotty.h"
+    #include "Skottie.h"
 #endif
 
 #if defined(SK_XML)
@@ -1317,10 +1317,10 @@
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 #if !defined(SK_BUILD_FOR_GOOGLE3)
-SkottySrc::SkottySrc(Path path)
+SkottieSrc::SkottieSrc(Path path)
     : fName(SkOSPath::Basename(path.c_str())) {
 
-    fAnimation  = skotty::Animation::MakeFromFile(path.c_str());
+    fAnimation  = skottie::Animation::MakeFromFile(path.c_str());
     if (!fAnimation) {
         return;
     }
@@ -1334,7 +1334,7 @@
 
 }
 
-Error SkottySrc::draw(SkCanvas* canvas) const {
+Error SkottieSrc::draw(SkCanvas* canvas) const {
     if (!fAnimation) {
         return SkStringPrintf("Unable to parse file: %s", fName.c_str());
     }
@@ -1383,15 +1383,15 @@
     return "";
 }
 
-SkISize SkottySrc::size() const {
+SkISize SkottieSrc::size() const {
     // Padding for grid.
     return SkISize::Make(kTileCount * (fTileSize.width()  + 1),
                          kTileCount * (fTileSize.height() + 1));
 }
 
-Name SkottySrc::name() const { return fName; }
+Name SkottieSrc::name() const { return fName; }
 
-bool SkottySrc::veto(SinkFlags flags) const {
+bool SkottieSrc::veto(SinkFlags flags) const {
     // No need to test to non-(raster||gpu||vector) or indirect backends.
     bool type_ok = flags.type == SinkFlags::kRaster
                 || flags.type == SinkFlags::kGPU