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

diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp
index 1842abe..df1b9d2 100644
--- a/samplecode/SamplePdfFileViewer.cpp
+++ b/samplecode/SamplePdfFileViewer.cpp
@@ -9,8 +9,7 @@
 
 #ifdef SAMPLE_PDF_FILE_VIEWER
 
-#include "SampleCode.h"
-#include "SkView.h"
+#include "Sample.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
@@ -27,7 +26,7 @@
 #include "SkTypeface.h"
 #include "SkPdfRenderer.h"
 
-class PdfFileViewer : public SampleView {
+class PdfFileViewer : public Sample {
 private:
     SkString    fFilename;
     SkPicture*  fPicture;  // TODO(edisonn): multiple pages, one page / picture, make it an array
@@ -56,13 +55,12 @@
     }
 
 protected:
-    // overrides from SkEventSink
-    virtual bool onQuery(SkEvent* evt) {
-        if (SampleCode::TitleQ(*evt)) {
+    virtual bool onQuery(Sample::Event* evt) {
+        if (Sample::TitleQ(*evt)) {
             SkString name("P:");
             const char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR);
             name.append(basename ? basename+1: fFilename.c_str());
-            SampleCode::TitleR(evt, name.c_str());
+            Sample::TitleR(evt, name.c_str());
             return true;
         }
         return this->INHERITED::onQuery(evt);
@@ -85,19 +83,19 @@
     }
 
 private:
-    typedef SampleView INHERITED;
+    typedef Sample INHERITED;
 };
 
-SampleView* CreateSamplePdfFileViewer(const char filename[]);
-SampleView* CreateSamplePdfFileViewer(const char filename[]) {
+Sample* CreateSamplePdfFileViewer(const char filename[]);
+Sample* CreateSamplePdfFileViewer(const char filename[]) {
     return new PdfFileViewer(filename);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 #if 0
-static SkView* MyFactory() { return new PdfFileViewer; }
-static SkViewRegister reg(MyFactory);
+static Sample* MyFactory() { return new PdfFileViewer; }
+static SampleRegister reg(MyFactory);
 #endif
 
 #endif  // SAMPLE_PDF_FILE_VIEWER