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/SampleArc.cpp b/samplecode/SampleArc.cpp
index a461a22..1222cf2 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "SampleCode.h"
+#include "Sample.h"
#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
@@ -21,7 +21,6 @@
#include "SkShader.h"
#include "SkString.h"
#include "SkUtils.h"
-#include "SkView.h"
#include "Sk1DPathEffect.h"
#include "SkParsePath.h"
@@ -37,7 +36,7 @@
SkParsePath::ToSVGString(p2, &str2);
}
-class ArcsView : public SampleView {
+class ArcsView : public Sample {
class MyDrawable : public SkDrawable {
SkRect fR;
SkScalar fSweep;
@@ -99,10 +98,9 @@
}
protected:
- // overrides from SkEventSink
- bool onQuery(SkEvent* evt) override {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "Arcs");
+ bool onQuery(Sample::Event* evt) override {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "Arcs");
return true;
}
return this->INHERITED::onQuery(evt);
@@ -199,10 +197,9 @@
private:
SkScalar fSweep;
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
-static SkView* MyFactory() { return new ArcsView; }
-static SkViewRegister reg(MyFactory);
+DEF_SAMPLE( return new ArcsView(); )