commit 6cfa29738295cd1f11f2218cbbacd31cf0b7ce7f
author Mike Reed <reed@google.com> Tue Jul 31 17:45:19 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 31 22:27:20 2018 +0000
tree 9c7df35af5ac32bc2a9279bff1c2ec0913fbfe7a
parent e2da5f90acf76beefe7dec76a99fc1cb5b0c249d

remove conditional flags for sksg -- not needed for a module

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

tools/viewer/SlideDir.cpp

diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp
index 0cc1230..517d823 100644
--- a/tools/viewer/SlideDir.cpp
+++ b/tools/viewer/SlideDir.cpp
@@ -7,8 +7,6 @@
 
 #include "SlideDir.h"
 
-#ifdef SK_HAS_SKSG
-
 #include "SkAnimTimer.h"
 #include "SkCanvas.h"
 #include "SkCubicMap.h"
@@ -422,5 +420,3 @@
 
     return idx < fRecs.count() ? &fRecs[idx] : nullptr;
 }
-
-#endif // SK_HAS_SKSG

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index b5a9084..94db6f7 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -43,9 +43,7 @@
 #include <stdlib.h>
 #include <map>
 
-#if defined(SK_HAS_SKSG)
-    #include "SlideDir.h"
-#endif
+#include "SlideDir.h"
 
 #if defined(SK_ENABLE_SKOTTIE)
     #include "SkottieSlide.h"
@@ -634,14 +632,12 @@
                     addSlide(name, SkOSPath::Join(flag.c_str(), name.c_str()), info.fFactory);
                 }
             }
-#if defined(SK_HAS_SKSG)
             if (!dirSlides.empty()) {
                 fSlides.push_back(
                     sk_make_sp<SlideDir>(SkStringPrintf("%s[%s]", info.fDirName, flag.c_str()),
                                          std::move(dirSlides)));
                 dirSlides.reset();
             }
-#endif
         }
     }
 }