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/SamplePathText.cpp b/samplecode/SamplePathText.cpp
index 0f58c53..cf09708 100644
--- a/samplecode/SamplePathText.cpp
+++ b/samplecode/SamplePathText.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "SampleCode.h"
+#include "Sample.h"
#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkGlyphCache.h"
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
// Static text from paths.
-class PathText : public SampleView {
+class PathText : public Sample {
public:
constexpr static int kNumPaths = 1500;
virtual const char* getName() const { return "PathText"; }
@@ -49,13 +49,13 @@
void onOnceBeforeDraw() final { this->INHERITED::onOnceBeforeDraw(); this->reset(); }
void onSizeChange() final { this->INHERITED::onSizeChange(); this->reset(); }
- bool onQuery(SkEvent* evt) final {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, this->getName());
+ bool onQuery(Sample::Event* evt) final {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, this->getName());
return true;
}
SkUnichar unichar;
- if (SampleCode::CharQ(*evt, &unichar)) {
+ if (Sample::CharQ(*evt, &unichar)) {
if (unichar == 'X') {
fDoClip = !fDoClip;
return true;
@@ -106,7 +106,7 @@
SkPath fClipPath = sk_tool_utils::make_star(SkRect{0,0,1,1}, 11, 3);
bool fDoClip = false;
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
void PathText::Glyph::init(SkRandom& rand, const SkPath& path) {