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>
diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index cb8061e..76243f6 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -5,8 +5,7 @@
* found in the LICENSE file.
*/
-#include "SampleCode.h"
-#include "SkView.h"
+#include "Sample.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkPaint.h"
@@ -54,7 +53,7 @@
static const int gWidth = 32;
static const int gHeight = 32;
-class TilingView : public SampleView {
+class TilingView : public Sample {
sk_sp<SkPicture> fTextPicture;
sk_sp<SkDrawLooper> fLooper;
public:
@@ -73,10 +72,9 @@
SkBitmap fTexture[SK_ARRAY_COUNT(gColorTypes)];
protected:
- // overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "Tiling");
+ virtual bool onQuery(Sample::Event* evt) {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "Tiling");
return true;
}
return this->INHERITED::onQuery(evt);
@@ -162,10 +160,9 @@
}
private:
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
-static SkView* MyFactory() { return new TilingView; }
-static SkViewRegister reg(MyFactory);
+DEF_SAMPLE( return new TilingView(); )