From 3b526b05d652ad6c310d9c636187b20b51c7648c Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 25 May 2018 12:43:51 -0400 Subject: "Modularize" SkSG * relocate all SkSG-related files under modules/sksg/ * fix various tidbits to make non-sksg builds possible * drop obsolete SampleSGInval.cpp Change-Id: I54e6c5bb1a09f45030fa8d607b3eb3f7cba78957 Reviewed-on: https://skia-review.googlesource.com/130025 Commit-Queue: Florin Malita Reviewed-by: Mike Klein --- tools/viewer/SlideDir.cpp | 4 ++++ tools/viewer/Viewer.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'tools/viewer') diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp index 1da6df4678..41bff87b79 100644 --- a/tools/viewer/SlideDir.cpp +++ b/tools/viewer/SlideDir.cpp @@ -7,6 +7,8 @@ #include "SlideDir.h" +#ifdef SK_HAS_SKSG + #include "SkAnimTimer.h" #include "SkCanvas.h" #include "SkCubicMap.h" @@ -418,3 +420,5 @@ const SlideDir::Rec* SlideDir::findCell(float x, float y) const { return idx < fRecs.count() ? &fRecs[idx] : nullptr; } + +#endif // SK_HAS_SKSG diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 85a72984a3..2357a18bb5 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -37,11 +37,14 @@ #include "SkTaskGroup.h" #include "SkTestFontMgr.h" #include "SkThreadedBMPDevice.h" -#include "SlideDir.h" #include "SvgSlide.h" #include "ccpr/GrCoverageCountingPathRenderer.h" #include "imgui.h" +#if defined(SK_HAS_SKSG) + #include "SlideDir.h" +#endif + #if defined(SK_ENABLE_SKOTTIE) #include "SkottieSlide.h" #endif @@ -646,13 +649,14 @@ void Viewer::initSlides() { 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(SkStringPrintf("%s[%s]", info.fDirName, flag.c_str()), std::move(dirSlides))); dirSlides.reset(); } +#endif } } } -- cgit v1.2.3