Revert of Add samples to Viewer. (patchset #4 id:60001 of https://codereview.chromium.org/2056343004/ )

Reason for revert:
breaking on android compile

Original issue's description:
> Add samples to Viewer.
>
> This adds support with animation, assuming the sample has
> implemented onAnimate. Event handling has not been
> implemented.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2056343004
>
> Committed: https://skia.googlesource.com/skia/+/76963e73704a42a18c29d6fbdcccb566e5c67658

TBR=bsalomon@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/2063883002

10 files changed, 11 insertions, 221 deletions

diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp
index c15e1d9f8e..1013e070ae 100644
--- a/gyp/viewer.gyp
+++ b/gyp/viewer.gyp
@@ -17,141 +17,27 @@
       ],
       'include_dirs': [
         '../bench',
-	'../experimental',
         '../gm',
         '../include/views',
         '../include/private',
-	'../samplecode',
         '../src/core',
         '../src/effects',
         '../src/gpu',
-        '../src/image',
         '../src/images',
-        '../src/pathops',
+        '../src/image',
         '../src/views/unix',
         '../tools/timer',
-	'../tools',
       ],
       'sources': [
         '../gm/gm.cpp',
-
+        '../src/views/SkTouchGesture.cpp',
         '../src/views/unix/keysym2ucs.c',
         '<!@(python find.py ../tools/viewer "*.cpp")',
-
-        # Samples
-        '../samplecode/GMSampleView.h',
-        '../samplecode/GMSampleView.cpp',
-        '../samplecode/ClockFaceView.cpp',
-        '../samplecode/OverView.cpp',
-        '../samplecode/OverView.h',
-        '../samplecode/PerlinPatch.cpp',
-        '../samplecode/Sample2PtRadial.cpp',
-        '../samplecode/SampleAAClip.cpp',
-        '../samplecode/SampleAAGeometry.cpp',
-        '../samplecode/SampleAARects.cpp',
-        '../samplecode/SampleAARectModes.cpp',
-        '../samplecode/SampleAll.cpp',
-        '../samplecode/SampleAnimatedText.cpp',
-        '../samplecode/SampleAnimBlur.cpp',
-        '../samplecode/SampleApp.cpp',
-        '../samplecode/SampleArc.cpp',
-        '../samplecode/SampleAtlas.cpp',
-        '../samplecode/SampleBigBlur.cpp',
-        '../samplecode/SampleBigGradient.cpp',
-        '../samplecode/SampleBitmapRect.cpp',
-        '../samplecode/SampleBlur.cpp',
-        '../samplecode/SampleCamera.cpp',
-        '../samplecode/SampleChart.cpp',
-        '../samplecode/SampleCircle.cpp',
-        '../samplecode/SampleClip.cpp',
-        '../samplecode/SampleClipDrawMatch.cpp',
-        '../samplecode/SampleClock.cpp',
-        '../samplecode/SampleCode.h',
-        '../samplecode/SampleColorFilter.cpp',
-        '../samplecode/SampleComplexClip.cpp',
-        '../samplecode/SampleConcavePaths.cpp',
-        '../samplecode/SampleDegenerateTwoPtRadials.cpp',
-        '../samplecode/SampleDither.cpp',
-        '../samplecode/SampleDitherBitmap.cpp',
-        '../samplecode/SampleEffects.cpp',
-        '../samplecode/SampleEmboss.cpp',
-        '../samplecode/SampleFatBits.cpp',
-        '../samplecode/SampleFillType.cpp',
-        '../samplecode/SampleFilter.cpp',
-        '../samplecode/SampleFilter2.cpp',
-        '../samplecode/SampleFilterQuality.cpp',
-        '../samplecode/SampleFilterFuzz.cpp',
-        '../samplecode/SampleFontCache.cpp',
-        '../samplecode/SampleFontScalerTest.cpp',
-        '../samplecode/SampleFuzz.cpp',
-        '../samplecode/SampleGradients.cpp',
-        '../samplecode/SampleHairCurves.cpp',
-        '../samplecode/SampleHairline.cpp',
-        '../samplecode/SampleHairModes.cpp',
-        '../samplecode/SampleHT.cpp',
-        '../samplecode/SampleIdentityScale.cpp',
-        '../samplecode/SampleLayerMask.cpp',
-        '../samplecode/SampleLayers.cpp',
-        '../samplecode/SampleLCD.cpp',
-        '../samplecode/SampleLighting.cpp',
-        '../samplecode/SampleLines.cpp',
-        '../samplecode/SampleLitAtlas.cpp',
-        '../samplecode/SampleLua.cpp',
-        '../samplecode/SampleManyRects.cpp',
-        '../samplecode/SampleMeasure.cpp',
-        '../samplecode/SampleMegaStroke.cpp',
-        '../samplecode/SamplePatch.cpp',
-        '../samplecode/SamplePath.cpp',
-        '../samplecode/SamplePathClip.cpp',
-        '../samplecode/SamplePathFuzz.cpp',
-        '../samplecode/SamplePathEffects.cpp',
-        '../samplecode/SamplePictFile.cpp',
-        '../samplecode/SamplePoints.cpp',
-        '../samplecode/SamplePolyToPoly.cpp',
-        '../samplecode/SampleQuadStroker.cpp',
-        '../samplecode/SampleRectanizer.cpp',
-        '../samplecode/SampleRegion.cpp',
-        '../samplecode/SampleRepeatTile.cpp',
-        '../samplecode/SampleShaders.cpp',
-        '../samplecode/SampleShaderText.cpp',
-        '../samplecode/SampleShip.cpp',
-        '../samplecode/SampleSkLayer.cpp',
-        '../samplecode/SampleSlides.cpp',
-        '../samplecode/SampleStringArt.cpp',
-        '../samplecode/SampleStrokePath.cpp',
-        '../samplecode/SampleSubpixelTranslate.cpp',
-        '../samplecode/SampleText.cpp',
-        '../samplecode/SampleTextAlpha.cpp',
-        '../samplecode/SampleTextBox.cpp',
-        '../samplecode/SampleTextOnPath.cpp',
-        '../samplecode/SampleTextureDomain.cpp',
-        '../samplecode/SampleTiling.cpp',
-        '../samplecode/SampleTinyBitmap.cpp',
-        '../samplecode/SampleUnpremul.cpp',
-        '../samplecode/SampleVertices.cpp',
-        '../samplecode/SampleXfermodesBlur.cpp',
-        '../samplecode/SampleXfer.cpp',
-        '../src/views/SkTouchGesture.cpp',
-	
-        # PerlinNoise2
-        '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp',
-        '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h',
-
-	# Lua
-        '../src/utils/SkLuaCanvas.cpp',
-        '../src/utils/SkLua.cpp',
       ],
-      'sources!': [
-        '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
-        '../samplecode/SampleFontCache.cpp', #relies on pthread.h
-      ],      
       'dependencies': [
-        'experimental.gyp:experimental',
         'flags.gyp:flags',
         'gputest.gyp:skgputest',
         'jsoncpp.gyp:jsoncpp',
-	'lua.gyp:lua',
-        'pdf.gyp:pdf',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:crash_handler',
         'tools.gyp:proc_stats',
@@ -159,8 +45,6 @@
         'tools.gyp:sk_tool_utils',
         'tools.gyp:timer',
         'tools.gyp:url_data_manager',
-	'views.gyp:views',
-	'xml.gyp:xml',
       ],
       'conditions' : [
         [ 'skia_os == "android"', {
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp
index 9cee95b84c..ef0fec7577 100644
--- a/samplecode/ClockFaceView.cpp
+++ b/samplecode/ClockFaceView.cpp
@@ -72,14 +72,7 @@ public:
     : Sk2DPathEffect(matrix), fRadius(radius), fPts(pts) {}
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect)
-    class Registrar {
-    public:
-        Registrar() {
-            SkFlattenable::Register("Dot2DPathEffect",
-                                    Dot2DPathEffect::CreateProc,
-                                    Dot2DPathEffect::GetFlattenableType());
-        }
-    };
+
 protected:
     void begin(const SkIRect& uvBounds, SkPath* dst) const override {
         if (fPts) {
@@ -108,8 +101,6 @@ private:
     typedef Sk2DPathEffect INHERITED;
 };
 
-static Dot2DPathEffect::Registrar gReg0;
-
 sk_sp<SkFlattenable> Dot2DPathEffect::CreateProc(SkReadBuffer& buffer) {
     SkMatrix matrix;
     buffer.readMatrix(&matrix);
diff --git a/samplecode/SampleAtlas.cpp b/samplecode/SampleAtlas.cpp
index 3daf312f6a..7cf1bb3761 100644
--- a/samplecode/SampleAtlas.cpp
+++ b/samplecode/SampleAtlas.cpp
@@ -232,11 +232,9 @@ protected:
 
     void onDrawContent(SkCanvas* canvas) override {
         canvas->drawDrawable(fDrawable);
+        this->inval(nullptr);
     }
 
-    bool onAnimate(const SkAnimTimer&) override {
-        return true;
-    }
 #if 0
     // TODO: switch over to use this for our animation
     bool onAnimate(const SkAnimTimer& timer) override {
diff --git a/samplecode/SampleClock.cpp b/samplecode/SampleClock.cpp
index ff3a5b1927..ae7462d1dc 100644
--- a/samplecode/SampleClock.cpp
+++ b/samplecode/SampleClock.cpp
@@ -215,10 +215,8 @@ protected:
 #endif
 
         canvas->restore();
-    }
 
-    bool onAnimate(const SkAnimTimer&) override {
-        return true;
+        this->inval(nullptr);
     }
 
 private:
diff --git a/tools/viewer/SKPSlide.cpp b/tools/viewer/SKPSlide.cpp
index 9419253f0c..6a9899b92f 100644
--- a/tools/viewer/SKPSlide.cpp
+++ b/tools/viewer/SKPSlide.cpp
@@ -48,7 +48,7 @@ static sk_sp<SkPicture> read_picture(const char path[]) {
     return pic;
 }
 
-void SKPSlide::load(SkScalar, SkScalar) {
+void SKPSlide::load() {
     fPic = read_picture(fPath.c_str());
     fCullRect = fPic->cullRect().roundOut();
 }
diff --git a/tools/viewer/SKPSlide.h b/tools/viewer/SKPSlide.h
index ff92ed1a39..42845fa30d 100644
--- a/tools/viewer/SKPSlide.h
+++ b/tools/viewer/SKPSlide.h
@@ -19,7 +19,7 @@ public:
     SkISize getDimensions() const override { return fCullRect.size(); }
 
     void draw(SkCanvas* canvas) override;
-    void load(SkScalar winWidth, SkScalar winHeight) override;
+    void load() override;
     void unload() override;
 
 private:
diff --git a/tools/viewer/SampleSlide.cpp b/tools/viewer/SampleSlide.cpp
deleted file mode 100755
index 2ae1280dc3..0000000000
--- a/tools/viewer/SampleSlide.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* Copyright 2016 Google Inc.
-*
-* Use of this source code is governed by a BSD-style license that can be
-* found in the LICENSE file.
-*/
-
-#include "SampleSlide.h"
-
-#include "SkCanvas.h"
-#include "SkCommonFlags.h"
-#include "SkOSFile.h"
-#include "SkStream.h"
-
-SampleSlide::SampleSlide(const SkViewFactory* factory) : fViewFactory(factory) {
-    SkView* view = (*factory)();
-    SampleCode::RequestTitle(view, &fName);
-    view->unref();
-}
-
-SampleSlide::~SampleSlide() {}
-
-void SampleSlide::draw(SkCanvas* canvas) {
-    fView->draw(canvas);
-}
-
-void SampleSlide::load(SkScalar winWidth, SkScalar winHeight) {
-    fView = (*fViewFactory)();
-    fView->setVisibleP(true);
-    fView->setClipToBounds(false);
-    fView->setSize(winWidth, winHeight);
-}
-
-void SampleSlide::unload() {
-    fView->unref();
-    fView = nullptr;
-}
diff --git a/tools/viewer/SampleSlide.h b/tools/viewer/SampleSlide.h
deleted file mode 100755
index 3d772d093d..0000000000
--- a/tools/viewer/SampleSlide.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* Copyright 2016 Google Inc.
-*
-* Use of this source code is governed by a BSD-style license that can be
-* found in the LICENSE file.
-*/
-
-#ifndef SampleSlide_DEFINED
-#define SampleSlide_DEFINED
-
-#include "Slide.h"
-#include "SampleCode.h"
-
-class SampleSlide : public Slide {
-public:
-    SampleSlide(const SkViewFactory* factory);
-    ~SampleSlide() override;
-
-    void draw(SkCanvas* canvas) override;
-    void load(SkScalar winWidth, SkScalar winHeight) override;
-    void unload() override;
-    bool animate(const SkAnimTimer& timer) override {
-        if (SampleView::IsSampleView(fView)) {
-            return ((SampleView*)fView)->animate(timer);
-        }
-        return false;
-    }
-
-private:
-    const SkViewFactory*   fViewFactory;
-    SkView*                fView;
-};
-
-#endif
diff --git a/tools/viewer/Slide.h b/tools/viewer/Slide.h
index bc0ffd4016..cdc225b0a8 100644
--- a/tools/viewer/Slide.h
+++ b/tools/viewer/Slide.h
@@ -19,13 +19,11 @@ class Slide : public SkRefCnt {
 public:
     virtual ~Slide() {}
 
-    virtual SkISize getDimensions() const {
-        return SkISize::Make(0, 0);
-    }
+    virtual SkISize getDimensions() const = 0;
 
     virtual void draw(SkCanvas* canvas) = 0;
     virtual bool animate(const SkAnimTimer&) { return false;  }
-    virtual void load(SkScalar winWidth, SkScalar winHeight) {}
+    virtual void load() {}
     virtual void unload() {}
 
     SkString getName() { return fName; }
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index ca7eddd12d..499673572b 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -8,7 +8,6 @@
 #include "Viewer.h"
 
 #include "GMSlide.h"
-#include "SampleSlide.h"
 #include "SKPSlide.h"
 
 #include "SkCanvas.h"
@@ -43,6 +42,7 @@ static void on_ui_state_changed_handler(const SkString& stateName, const SkStrin
 }
 
 DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
+DEFINE_string(key, "", "Space-separated key/value pairs to add to JSON identifying this builder.");
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
@@ -196,14 +196,6 @@ void Viewer::initSlides() {
         fSlides[fSlides.count() - i - 1] = temp;
     }
 
-    // samples
-    const SkViewRegister* reg = SkViewRegister::Head();
-    while (reg) {
-        sk_sp<Slide> slide(new SampleSlide(reg->factory()));
-        fSlides.push_back(slide);
-        reg = reg->next();
-    }
-
     // SKPs
     for (int i = 0; i < FLAGS_skps.count(); i++) {
         if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
@@ -280,7 +272,7 @@ void Viewer::setupCurrentSlide(int previousSlide) {
 
     this->updateTitle();
     this->updateUIState();
-    fSlides[fCurrentSlide]->load(SkIntToScalar(fWindow->width()), SkIntToScalar(fWindow->height()));
+    fSlides[fCurrentSlide]->load();
     if (previousSlide >= 0) {
         fSlides[previousSlide]->unload();
     }