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/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 82883c6..7f691c6 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.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 "SkGradientShader.h"
@@ -148,7 +147,7 @@
}
}
-class RegionView : public SampleView {
+class RegionView : public Sample {
public:
RegionView() {
fBase.set(100, 100, 150, 150);
@@ -172,10 +171,9 @@
protected:
- // overrides from SkEventSink
- bool onQuery(SkEvent* evt) override {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "Regions");
+ bool onQuery(Sample::Event* evt) override {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "Regions");
return true;
}
return this->INHERITED::onQuery(evt);
@@ -328,7 +326,7 @@
}
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
+ virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
unsigned modi) override {
return fRect.contains(SkScalarRoundToInt(x),
SkScalarRoundToInt(y)) ? new Click(this) : nullptr;
@@ -343,10 +341,9 @@
private:
SkIRect fBase, fRect;
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
-static SkView* MyFactory() { return new RegionView; }
-static SkViewRegister reg(MyFactory);
+DEF_SAMPLE( return new RegionView(); )