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/SampleDash.cpp b/samplecode/SampleDash.cpp
index f2c6b8b..5880d79 100644
--- a/samplecode/SampleDash.cpp
+++ b/samplecode/SampleDash.cpp
@@ -4,8 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "SampleCode.h"
-#include "SkView.h"
+#include "Sample.h"
#include "SkCanvas.h"
#include "SkGraphics.h"
#include "SkRandom.h"
@@ -32,17 +31,16 @@
paint->setShader(s)->unref();
}
-class DashView : public SampleView {
+class DashView : public Sample {
public:
DashView() {
this->setBGColor(0xFFDDDDDD);
}
protected:
- // overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "Dash");
+ virtual bool onQuery(Sample::Event* evt) {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "Dash");
return true;
}
return this->INHERITED::onQuery(evt);
@@ -82,10 +80,10 @@
}
private:
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
-static SkView* MyFactory() { return new DashView; }
-static SkViewRegister reg(MyFactory);
+static Sample* MyFactory() { return new DashView; }
+static SampleRegister reg(MyFactory);