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
87 lines
2.7 KiB
C++
87 lines
2.7 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 "SkColorPriv.h"
|
|
#include "SkShader.h"
|
|
#include "SkSurface.h"
|
|
|
|
#include "SkColorMatrixFilter.h"
|
|
#include "SkGradientShader.h"
|
|
|
|
static sk_sp<SkShader> make_opaque_color() {
|
|
return SkShader::MakeColorShader(0xFFFF0000);
|
|
}
|
|
|
|
static sk_sp<SkShader> make_alpha_color() {
|
|
return SkShader::MakeColorShader(0x80FF0000);
|
|
}
|
|
|
|
static sk_sp<SkColorFilter> make_cf_null() {
|
|
return nullptr;
|
|
}
|
|
|
|
static sk_sp<SkColorFilter> make_cf0() {
|
|
SkColorMatrix cm;
|
|
cm.setSaturation(0.75f);
|
|
return SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat);
|
|
}
|
|
|
|
static sk_sp<SkColorFilter> make_cf1() {
|
|
SkColorMatrix cm;
|
|
cm.setSaturation(0.75f);
|
|
auto a(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
|
|
// CreateComposedFilter will try to concat these two matrices, resulting in a single
|
|
// filter (which is good for speed). For this test, we want to force a real compose of
|
|
// these two, so our inner filter has a scale-up, which disables the optimization of
|
|
// combining the two matrices.
|
|
cm.setScale(1.1f, 0.9f, 1);
|
|
auto b(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
|
|
return SkColorFilter::MakeComposeFilter(a, b);
|
|
}
|
|
|
|
static sk_sp<SkColorFilter> make_cf2() {
|
|
return SkColorFilter::MakeModeFilter(0x8044CC88, SkXfermode::kSrcATop_Mode);
|
|
}
|
|
|
|
static void draw_into_canvas(SkCanvas* canvas) {
|
|
const SkRect r = SkRect::MakeWH(50, 100);
|
|
sk_sp<SkShader> (*shaders[])() { make_opaque_color, make_alpha_color };
|
|
sk_sp<SkColorFilter> (*filters[])() { make_cf_null, make_cf0, make_cf1, make_cf2 };
|
|
|
|
SkPaint paint;
|
|
for (auto shProc : shaders) {
|
|
paint.setShader(shProc());
|
|
for (auto cfProc : filters) {
|
|
paint.setColorFilter(cfProc());
|
|
canvas->drawRect(r, paint);
|
|
canvas->translate(60, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_SIMPLE_GM(color4f, canvas, 1024, 260) {
|
|
canvas->translate(10, 10);
|
|
|
|
SkPaint bg;
|
|
// need the target to be opaque, so we can draw it to the screen
|
|
// even if it holds sRGB values.
|
|
bg.setColor(0xFFFFFFFF);
|
|
|
|
SkColorProfileType const profiles[] { kLinear_SkColorProfileType, kSRGB_SkColorProfileType };
|
|
for (auto profile : profiles) {
|
|
const SkImageInfo info = SkImageInfo::Make(1024, 100, kN32_SkColorType, kPremul_SkAlphaType,
|
|
profile);
|
|
SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
|
|
surface->getCanvas()->drawPaint(bg);
|
|
draw_into_canvas(surface->getCanvas());
|
|
surface->draw(canvas, 0, 0, nullptr);
|
|
canvas->translate(0, 120);
|
|
}
|
|
}
|