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/SampleCircle.cpp b/samplecode/SampleCircle.cpp
index f4e6cc9..3063324 100644
--- a/samplecode/SampleCircle.cpp
+++ b/samplecode/SampleCircle.cpp
@@ -5,11 +5,10 @@
* found in the LICENSE file.
*/
-#include "SampleCode.h"
+#include "Sample.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkPath.h"
-#include "SkView.h"
// ensure that we don't accidentally screw up the bounds when the oval is
// fractional, and the impl computes the center and radii, and uses them to
@@ -22,7 +21,7 @@
SkASSERT(r == p.getBounds());
}
-class CircleView : public SampleView {
+class CircleView : public Sample {
public:
static const SkScalar ANIM_DX;
static const SkScalar ANIM_DY;
@@ -35,10 +34,9 @@
}
protected:
- // overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "Circles");
+ virtual bool onQuery(Sample::Event* evt) {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "Circles");
return true;
}
return this->INHERITED::onQuery(evt);
@@ -107,7 +105,7 @@
private:
int fN;
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
const SkScalar CircleView::ANIM_DX(SK_Scalar1 / 67);
@@ -116,5 +114,4 @@
//////////////////////////////////////////////////////////////////////////////
-static SkView* MyFactory() { return new CircleView; }
-static SkViewRegister reg(MyFactory);
+DEF_SAMPLE( return new CircleView(); )