diff options
author | Mike Reed <reed@google.com> | 2016-10-03 18:02:50 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 18:03:29 +0000 |
commit | ce02e7175872abde3721df9e5d3ec0ab8384cd8e (patch) | |
tree | 620eec63e1082137df3111d09cd2bf1eb7ebd180 /samplecode/SampleXfer.cpp | |
parent | 6fb592e6afb0061c9c0af15ddf599e2903f508f1 (diff) |
Revert "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit I4fb489ba6b3f77b458f7e4a99f79c7ad10859135.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> replace SkXfermode obj with SkBlendMode enum in paints
>
> BUG=skia:5814
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
>
> Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
> Reviewed-on: https://skia-review.googlesource.com/2714
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bsalomon@google.com,fmalita@chromium.org,fmalita@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I3e43f79ef5c1709929663fe63cc1f67cd78270b7
Reviewed-on: https://skia-review.googlesource.com/2871
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'samplecode/SampleXfer.cpp')
-rw-r--r-- | samplecode/SampleXfer.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp index c0ad000501..6aaffe59c9 100644 --- a/samplecode/SampleXfer.cpp +++ b/samplecode/SampleXfer.cpp @@ -18,18 +18,18 @@ #include "SkGradientShader.h" const struct { - SkBlendMode fMode; - const char* fName; + SkXfermode::Mode fMode; + const char* fName; } gModes[] = { - { SkBlendMode::kSrcOver, "src-over" }, - { SkBlendMode::kSrc, "src" }, - { SkBlendMode::kSrcIn, "src-in" }, - { SkBlendMode::kSrcOut, "src-out" }, - { SkBlendMode::kSrcATop, "src-atop" }, - { SkBlendMode::kDstOver, "dst-over" }, - { SkBlendMode::kDstIn, "dst-in" }, - { SkBlendMode::kDstOut, "dst-out" }, - { SkBlendMode::kDstATop, "dst-atop" }, + { SkXfermode::kSrcOver_Mode, "src-over" }, + { SkXfermode::kSrc_Mode, "src" }, + { SkXfermode::kSrcIn_Mode, "src-in" }, + { SkXfermode::kSrcOut_Mode, "src-out" }, + { SkXfermode::kSrcATop_Mode, "src-atop" }, + { SkXfermode::kDstOver_Mode, "dst-over" }, + { SkXfermode::kDstIn_Mode, "dst-in" }, + { SkXfermode::kDstOut_Mode, "dst-out" }, + { SkXfermode::kDstATop_Mode, "dst-atop" }, }; const int N_Modes = SK_ARRAY_COUNT(gModes); @@ -109,10 +109,10 @@ private: class ModeDrawable : public SkDrawable { public: - ModeDrawable() : fMode(SkBlendMode::kSrcOver), fLoc(SkPoint::Make(0, 0)) {} + ModeDrawable() : fMode(SkXfermode::kSrcOver_Mode), fLoc(SkPoint::Make(0, 0)) {} - SkBlendMode fMode; - SkPoint fLoc; + SkXfermode::Mode fMode; + SkPoint fLoc; bool hitTest(SkScalar x, SkScalar y) { SkRect target = SkRect::MakeXYWH(x - fLoc.x() - 1, y - fLoc.y() - 1, 3, 3); @@ -139,7 +139,7 @@ protected: } void onDraw(SkCanvas* canvas) override { - fPaint.setBlendMode(fMode); + fPaint.setXfermodeMode(fMode); canvas->save(); canvas->translate(fLoc.x(), fLoc.y()); canvas->drawOval(fBounds, fPaint); @@ -160,7 +160,7 @@ class XferDemo : public SampleView { SkScalar x = 10; SkScalar y = 10; for (int i = 0; i < N_Modes; ++i) { - SkAutoTUnref<SkView> v(new PushButtonWig(gModes[i].fName, (int)gModes[i].fMode)); + SkAutoTUnref<SkView> v(new PushButtonWig(gModes[i].fName, gModes[i].fMode)); v->setSize(70, 25); v->setLoc(x, y); v->setVisibleP(true); @@ -178,7 +178,7 @@ public: for (int i = 0; i < N; ++i) { fDrs[i].reset(new CircDrawable(200, colors[i])); fDrs[i]->fLoc.set(100.f + i * 100, 100.f + i * 100); - fDrs[i]->fMode = SkBlendMode::kSrcOver; + fDrs[i]->fMode = SkXfermode::kSrcOver_Mode; } fSelected = nullptr; @@ -189,7 +189,7 @@ protected: bool onEvent(const SkEvent& evt) override { if (evt.isType("push-button")) { if (fSelected) { - fSelected->fMode = (SkBlendMode)evt.getFast32(); + fSelected->fMode = (SkXfermode::Mode)evt.getFast32(); this->inval(nullptr); } return true; |