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/SampleAndroidShadows.cpp b/samplecode/SampleAndroidShadows.cpp
index cdc9e75..d4603a1 100644
--- a/samplecode/SampleAndroidShadows.cpp
+++ b/samplecode/SampleAndroidShadows.cpp
@@ -5,7 +5,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 "Sample.h"
#include "SkAnimTimer.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
@@ -17,12 +17,11 @@
#include "SkPoint3.h"
#include "SkShadowUtils.h"
#include "SkUtils.h"
-#include "SkView.h"
#include "sk_tool_utils.h"
////////////////////////////////////////////////////////////////////////////
-class ShadowsView : public SampleView {
+class ShadowsView : public Sample {
SkPath fRectPath;
SkPath fRRPath;
SkPath fCirclePath;
@@ -107,15 +106,14 @@
fLightPos = SkPoint3::Make(350, 0, 600);
}
- // overrides from SkEventSink
- bool onQuery(SkEvent* evt) override {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "AndroidShadows");
+ bool onQuery(Sample::Event* evt) override {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "AndroidShadows");
return true;
}
SkUnichar uni;
- if (SampleCode::CharQ(*evt, &uni)) {
+ if (Sample::CharQ(*evt, &uni)) {
bool handled = false;
switch (uni) {
case 'W':
@@ -353,10 +351,9 @@
}
private:
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
-static SkView* MyFactory() { return new ShadowsView; }
-static SkViewRegister reg(MyFactory);
+DEF_SAMPLE( return new ShadowsView(); )