commit b2c4ea62198c5cf0a2479987bac97c3b4eb4934b
author Ben Wagner <bungeman@google.com> Wed Aug 08 11:36:17 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 09 15:25:32 2018 +0000
tree d684553b94551801a7931c733edd96bc0826b72e
parent d1910d5664f6620c8cdfff1cd366519c515f5686

Move Views into Sample and Viewer.

What is left of the SkView system is used only by samples or viewer.
As a result, move it out of the Skia source tree and re-organize so it
is a bit easier to understand and use more shared code.

Move samplecode/ClockFaceView.cpp to samplecode/SampleTextEffects.cpp,
sice that's what's actually in it.

Move SkAnimTimer.h to tools/timer, since it's actually shared between gm
and samples.

Change-Id: I55dafd94c64e4f930ddbd19168e0f812af86c455
Reviewed-on: https://skia-review.googlesource.com/146161
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

samplecode/SampleChineseFling.cpp

diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp
index 05e0218..2a25998 100644
--- a/samplecode/SampleChineseFling.cpp
+++ b/samplecode/SampleChineseFling.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Resources.h"
-#include "SampleCode.h"
+#include "Sample.h"
 #include "sk_tool_utils.h"
 
 #include "SkCanvas.h"
@@ -46,14 +46,14 @@
 #endif
 }
 
-class ChineseFlingView : public SampleView {
+class ChineseFlingView : public Sample {
 public:
     ChineseFlingView() : fBlobs(kNumBlobs) {}
 
 protected:
-    bool onQuery(SkEvent* evt) override {
-        if (SampleCode::TitleQ(*evt)) {
-            SampleCode::TitleR(evt, "chinese-fling");
+    bool onQuery(Sample::Event* evt) override {
+        if (Sample::TitleQ(*evt)) {
+            Sample::TitleR(evt, "chinese-fling");
             return true;
         }
         return this->INHERITED::onQuery(evt);
@@ -126,21 +126,21 @@
     SkRandom                    fRand;
     int                         fIndex;
 
-    typedef SkView INHERITED;
+    typedef Sample INHERITED;
 };
 
-class ChineseZoomView : public SampleView {
+class ChineseZoomView : public Sample {
 public:
     ChineseZoomView() : fBlobs(kNumBlobs), fScale(15.0f), fTranslate(0.0f) {}
 
 protected:
-    bool onQuery(SkEvent* evt) override {
-        if (SampleCode::TitleQ(*evt)) {
-            SampleCode::TitleR(evt, "chinese-zoom");
+    bool onQuery(Sample::Event* evt) override {
+        if (Sample::TitleQ(*evt)) {
+            Sample::TitleR(evt, "chinese-zoom");
             return true;
         }
         SkUnichar uni;
-        if (SampleCode::CharQ(*evt, &uni)) {
+        if (Sample::CharQ(*evt, &uni)) {
             if ('>' == uni) {
                 fScale += 0.125f;
                 return true;
@@ -260,13 +260,10 @@
     SkScalar                    fTranslate;
     int                         fIndex;
 
-    typedef SkView INHERITED;
+    typedef Sample INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-static SkView* FlingFactory() { return new ChineseFlingView; }
-static SkViewRegister regFling(FlingFactory);
-
-static SkView* ZoomFactory() { return new ChineseZoomView; }
-static SkViewRegister regZoom(ZoomFactory);
+DEF_SAMPLE( return new ChineseFlingView(); )
+DEF_SAMPLE( return new ChineseZoomView(); )