d053ce9c54
Reason for revert:
guard has now landed in chrome
Original issue's description:
> Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
>
> Reason for revert:
> CreateModeFilter not compiling
>
> Original issue's description:
> > Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
> >
> > Fixed legacy withColorFilter to call new(er) make method
> >
> > This reverts commit 1eb81db650
.
> >
> > BUG=skia:
> > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
> >
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
>
> TBR=
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d6889293dd0942f27f9593f679722c956831f2c4
TBR=
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review URL: https://codereview.chromium.org/1827433002
326 lines
9.5 KiB
C++
326 lines
9.5 KiB
C++
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkColorFilter.h"
|
|
#include "SkColorPriv.h"
|
|
#include "SkShader.h"
|
|
|
|
#include "SkBlurImageFilter.h"
|
|
#include "SkColorFilterImageFilter.h"
|
|
#include "SkDropShadowImageFilter.h"
|
|
#include "SkTestImageFilters.h"
|
|
|
|
class FailImageFilter : public SkImageFilter {
|
|
public:
|
|
class Registrar {
|
|
public:
|
|
Registrar() {
|
|
SkFlattenable::Register("FailImageFilter",
|
|
FailImageFilter::CreateProc,
|
|
FailImageFilter::GetFlattenableType());
|
|
}
|
|
};
|
|
static FailImageFilter* Create() { return new FailImageFilter; }
|
|
|
|
SK_TO_STRING_OVERRIDE()
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
|
|
|
|
protected:
|
|
FailImageFilter() : INHERITED(0, nullptr) {}
|
|
|
|
bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
|
|
SkBitmap* result, SkIPoint* offset) const override {
|
|
return false;
|
|
}
|
|
|
|
private:
|
|
typedef SkImageFilter INHERITED;
|
|
};
|
|
|
|
static FailImageFilter::Registrar gReg0;
|
|
|
|
SkFlattenable* FailImageFilter::CreateProc(SkReadBuffer& buffer) {
|
|
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
|
|
return FailImageFilter::Create();
|
|
}
|
|
|
|
#ifndef SK_IGNORE_TO_STRING
|
|
void FailImageFilter::toString(SkString* str) const {
|
|
str->appendf("FailImageFilter: (");
|
|
str->append(")");
|
|
}
|
|
#endif
|
|
|
|
class IdentityImageFilter : public SkImageFilter {
|
|
public:
|
|
class Registrar {
|
|
public:
|
|
Registrar() {
|
|
SkFlattenable::Register("IdentityImageFilter",
|
|
IdentityImageFilter::CreateProc,
|
|
IdentityImageFilter::GetFlattenableType());
|
|
}
|
|
};
|
|
static IdentityImageFilter* Create(SkImageFilter* input = nullptr) {
|
|
return new IdentityImageFilter(input);
|
|
}
|
|
|
|
SK_TO_STRING_OVERRIDE()
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
|
|
protected:
|
|
IdentityImageFilter(SkImageFilter* input) : INHERITED(1, &input) {}
|
|
|
|
bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
|
|
SkBitmap* result, SkIPoint* offset) const override {
|
|
*result = src;
|
|
offset->set(0, 0);
|
|
return true;
|
|
}
|
|
|
|
private:
|
|
typedef SkImageFilter INHERITED;
|
|
};
|
|
|
|
static IdentityImageFilter::Registrar gReg1;
|
|
|
|
SkFlattenable* IdentityImageFilter::CreateProc(SkReadBuffer& buffer) {
|
|
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
|
|
return IdentityImageFilter::Create(common.getInput(0));
|
|
}
|
|
|
|
#ifndef SK_IGNORE_TO_STRING
|
|
void IdentityImageFilter::toString(SkString* str) const {
|
|
str->appendf("IdentityImageFilter: (");
|
|
str->append(")");
|
|
}
|
|
#endif
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
static void draw_paint(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
|
|
SkPaint paint;
|
|
paint.setImageFilter(imf);
|
|
paint.setColor(SK_ColorGREEN);
|
|
canvas->save();
|
|
canvas->clipRect(r);
|
|
canvas->drawPaint(paint);
|
|
canvas->restore();
|
|
}
|
|
|
|
static void draw_line(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
|
|
SkPaint paint;
|
|
paint.setColor(SK_ColorBLUE);
|
|
paint.setImageFilter(imf);
|
|
paint.setStrokeWidth(r.width()/10);
|
|
canvas->drawLine(r.fLeft, r.fTop, r.fRight, r.fBottom, paint);
|
|
}
|
|
|
|
static void draw_rect(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
|
|
SkPaint paint;
|
|
paint.setColor(SK_ColorYELLOW);
|
|
paint.setImageFilter(imf);
|
|
SkRect rr(r);
|
|
rr.inset(r.width()/10, r.height()/10);
|
|
canvas->drawRect(rr, paint);
|
|
}
|
|
|
|
static void draw_path(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
|
|
SkPaint paint;
|
|
paint.setColor(SK_ColorMAGENTA);
|
|
paint.setImageFilter(imf);
|
|
paint.setAntiAlias(true);
|
|
canvas->drawCircle(r.centerX(), r.centerY(), r.width()*2/5, paint);
|
|
}
|
|
|
|
static void draw_text(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
|
|
SkPaint paint;
|
|
paint.setImageFilter(imf);
|
|
paint.setColor(SK_ColorCYAN);
|
|
paint.setAntiAlias(true);
|
|
sk_tool_utils::set_portable_typeface(&paint);
|
|
paint.setTextSize(r.height()/2);
|
|
paint.setTextAlign(SkPaint::kCenter_Align);
|
|
canvas->drawText("Text", 4, r.centerX(), r.centerY(), paint);
|
|
}
|
|
|
|
static void draw_bitmap(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
|
|
SkPaint paint;
|
|
paint.setImageFilter(imf);
|
|
|
|
SkIRect bounds;
|
|
r.roundOut(&bounds);
|
|
|
|
SkBitmap bm;
|
|
bm.allocN32Pixels(bounds.width(), bounds.height());
|
|
bm.eraseColor(SK_ColorTRANSPARENT);
|
|
SkCanvas c(bm);
|
|
draw_path(&c, r, nullptr);
|
|
|
|
canvas->drawBitmap(bm, 0, 0, &paint);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
class ImageFiltersBaseGM : public skiagm::GM {
|
|
public:
|
|
ImageFiltersBaseGM () {}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return SkString("imagefiltersbase");
|
|
}
|
|
|
|
SkISize onISize() override { return SkISize::Make(700, 500); }
|
|
|
|
void draw_frame(SkCanvas* canvas, const SkRect& r) {
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setColor(SK_ColorRED);
|
|
canvas->drawRect(r, paint);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
|
|
draw_paint,
|
|
draw_line, draw_rect, draw_path, draw_text,
|
|
draw_bitmap,
|
|
};
|
|
|
|
auto cf = SkColorFilter::MakeModeFilter(SK_ColorRED, SkXfermode::kSrcIn_Mode);
|
|
SkImageFilter* filters[] = {
|
|
nullptr,
|
|
IdentityImageFilter::Create(),
|
|
FailImageFilter::Create(),
|
|
SkColorFilterImageFilter::Create(cf.get()),
|
|
SkBlurImageFilter::Create(12.0f, 0.0f),
|
|
SkDropShadowImageFilter::Create(10.0f, 5.0f, 3.0f, 3.0f, SK_ColorBLUE,
|
|
SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode),
|
|
};
|
|
|
|
SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
|
|
SkScalar MARGIN = SkIntToScalar(16);
|
|
SkScalar DX = r.width() + MARGIN;
|
|
SkScalar DY = r.height() + MARGIN;
|
|
|
|
canvas->translate(MARGIN, MARGIN);
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(drawProc); ++i) {
|
|
canvas->save();
|
|
for (size_t j = 0; j < SK_ARRAY_COUNT(filters); ++j) {
|
|
drawProc[i](canvas, r, filters[j]);
|
|
|
|
draw_frame(canvas, r);
|
|
canvas->translate(0, DY);
|
|
}
|
|
canvas->restore();
|
|
canvas->translate(DX, 0);
|
|
}
|
|
|
|
for(size_t j = 0; j < SK_ARRAY_COUNT(filters); ++j) {
|
|
SkSafeUnref(filters[j]);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
DEF_GM( return new ImageFiltersBaseGM; )
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
/*
|
|
* Want to test combos of filter and LCD text, to be sure we disable LCD in the presence of
|
|
* a filter.
|
|
*/
|
|
class ImageFiltersTextBaseGM : public skiagm::GM {
|
|
SkString fSuffix;
|
|
public:
|
|
ImageFiltersTextBaseGM(const char suffix[]) : fSuffix(suffix) {}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
SkString name;
|
|
name.printf("%s_%s", "textfilter", fSuffix.c_str());
|
|
return name;
|
|
}
|
|
|
|
SkISize onISize() override { return SkISize::Make(512, 342); }
|
|
|
|
void drawWaterfall(SkCanvas* canvas, const SkPaint& origPaint) {
|
|
const uint32_t flags[] = {
|
|
0,
|
|
SkPaint::kAntiAlias_Flag,
|
|
SkPaint::kAntiAlias_Flag | SkPaint::kLCDRenderText_Flag,
|
|
};
|
|
SkPaint paint(origPaint);
|
|
sk_tool_utils::set_portable_typeface(&paint);
|
|
paint.setTextSize(30);
|
|
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(flags); ++i) {
|
|
paint.setFlags(flags[i]);
|
|
canvas->drawText("Hamburgefons", 11, 0, 0, paint);
|
|
canvas->translate(0, 40);
|
|
}
|
|
}
|
|
|
|
virtual void installFilter(SkPaint* paint) = 0;
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
SkPaint paint;
|
|
|
|
canvas->translate(20, 40);
|
|
|
|
for (int doSaveLayer = 0; doSaveLayer <= 1; ++doSaveLayer) {
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
for (int useFilter = 0; useFilter <= 1; ++useFilter) {
|
|
SkAutoCanvasRestore acr2(canvas, true);
|
|
|
|
SkPaint paint;
|
|
if (useFilter) {
|
|
this->installFilter(&paint);
|
|
}
|
|
if (doSaveLayer) {
|
|
canvas->saveLayer(nullptr, &paint);
|
|
paint.setImageFilter(nullptr);
|
|
}
|
|
this->drawWaterfall(canvas, paint);
|
|
|
|
acr2.restore();
|
|
canvas->translate(250, 0);
|
|
}
|
|
acr.restore();
|
|
canvas->translate(0, 200);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
class ImageFiltersText_IF : public ImageFiltersTextBaseGM {
|
|
public:
|
|
ImageFiltersText_IF() : ImageFiltersTextBaseGM("image") {}
|
|
|
|
void installFilter(SkPaint* paint) override {
|
|
paint->setImageFilter(SkBlurImageFilter::Create(1.5f, 1.5f))->unref();
|
|
}
|
|
};
|
|
DEF_GM( return new ImageFiltersText_IF; )
|
|
|
|
class ImageFiltersText_CF : public ImageFiltersTextBaseGM {
|
|
public:
|
|
ImageFiltersText_CF() : ImageFiltersTextBaseGM("color") {}
|
|
|
|
void installFilter(SkPaint* paint) override {
|
|
paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
|
|
}
|
|
};
|
|
DEF_GM( return new ImageFiltersText_CF; )
|
|
|