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/SampleCamera.cpp

diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index fdba403..9a79003 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -6,9 +6,8 @@
  */
 
 #include "DecodeFile.h"
-#include "SampleCode.h"
+#include "Sample.h"
 #include "SkAnimTimer.h"
-#include "SkView.h"
 #include "SkCanvas.h"
 #include "SkCamera.h"
 #include "SkEmbossMaskFilter.h"
@@ -20,7 +19,7 @@
 #include "SkString.h"
 #include "SkUtils.h"
 
-class CameraView : public SampleView {
+class CameraView : public Sample {
     SkTArray<sk_sp<SkShader>> fShaders;
     int     fShaderIndex;
     bool    fFrontFace;
@@ -52,10 +51,9 @@
     }
 
 protected:
-    // overrides from SkEventSink
-    bool onQuery(SkEvent* evt) override {
-        if (SampleCode::TitleQ(*evt)) {
-            SampleCode::TitleR(evt, "Camera");
+    bool onQuery(Sample::Event* evt) override {
+        if (Sample::TitleQ(*evt)) {
+            Sample::TitleR(evt, "Camera");
             return true;
         }
         return this->INHERITED::onQuery(evt);
@@ -96,10 +94,9 @@
 
 private:
     SkScalar fRX, fRY, fRZ;
-    typedef SampleView INHERITED;
+    typedef Sample INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-static SkView* MyFactory() { return new CameraView; }
-static SkViewRegister reg(MyFactory);
+DEF_SAMPLE( return new CameraView(); )