diff options
author | reed <reed@google.com> | 2016-01-07 08:15:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-07 08:15:10 -0800 |
commit | 0575cb2def2f4dfdad04e0674d0f8eb8e7c24cec (patch) | |
tree | 9fc4c73da2ed766a9cab0eee77d67d44233b76d1 /samplecode/SampleLayers.cpp | |
parent | 983dc2541a729609037a05eba731b3eb9788c517 (diff) |
Revert of add backdrop option to SaveLayerRec (patchset #14 id:260001 of https://codereview.chromium.org/1523053003/ )
Reason for revert:
serialized != direct, will investigate
Original issue's description:
> add backdrop option to SaveLayerRec
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1523053003
>
> Committed: https://skia.googlesource.com/skia/+/247415969a9a5ed6c83cc09395472416c4b7de7f
TBR=robertphillips@google.com,bsalomon@google.com,mtklein@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1565203002
Diffstat (limited to 'samplecode/SampleLayers.cpp')
-rw-r--r-- | samplecode/SampleLayers.cpp | 76 |
1 files changed, 2 insertions, 74 deletions
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp index f8ebd7c94f..52bf5b357b 100644 --- a/samplecode/SampleLayers.cpp +++ b/samplecode/SampleLayers.cpp @@ -232,80 +232,8 @@ protected: private: typedef SkView INHERITED; }; -DEF_SAMPLE( return new LayersView; ) ////////////////////////////////////////////////////////////////////////////// -#include "SkBlurImageFilter.h" -#include "SkMatrixConvolutionImageFilter.h" -#include "SkMorphologyImageFilter.h" - -#include "Resources.h" -#include "SkAnimTimer.h" - -class BackdropView : public SampleView { - SkPoint fCenter; - SkScalar fAngle; - SkAutoTUnref<SkImage> fImage; - SkAutoTUnref<SkImageFilter> fFilter; -public: - BackdropView() { - fCenter.set(200, 150); - fAngle = 0; - fImage.reset(GetResourceAsImage("mandrill_512.png")); - fFilter.reset(SkDilateImageFilter::Create(8, 8)); - } - -protected: - // overrides from SkEventSink - bool onQuery(SkEvent* evt) override { - if (SampleCode::TitleQ(*evt)) { - SampleCode::TitleR(evt, "Backdrop"); - return true; - } - return this->INHERITED::onQuery(evt); - } - - void onDrawContent(SkCanvas* canvas) override { - canvas->drawImage(fImage, 0, 0, nullptr); - - const SkScalar w = 250; - const SkScalar h = 150; - SkPath path; - path.addOval(SkRect::MakeXYWH(-w/2, -h/2, w, h)); - SkMatrix m; - m.setRotate(fAngle); - m.postTranslate(fCenter.x(), fCenter.y()); - path.transform(m); - - canvas->clipPath(path, SkRegion::kIntersect_Op, true); - const SkRect bounds = path.getBounds(); - - SkPaint paint; - paint.setAlpha(0xCC); - canvas->saveLayer({ &bounds, &paint, fFilter, 0 }); - - canvas->restore(); - } - - bool onAnimate(const SkAnimTimer& timer) override { - fAngle = SkDoubleToScalar(fmod(timer.secs() * 360 / 5, 360)); - return true; - } - - SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override { - this->inval(nullptr); - return new Click(this); - } - - bool onClick(Click* click) override { - this->inval(nullptr); - fCenter = click->fCurr; - return this->INHERITED::onClick(click); - } - -private: - typedef SampleView INHERITED; -}; -DEF_SAMPLE( return new BackdropView; ) - +static SkView* MyFactory() { return new LayersView; } +static SkViewRegister reg(MyFactory); |