diff options
| author |  Mike Reed <reed@google.com> | 2018-02-19 14:10:57 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-19 19:40:14 +0000 |
| commit | 19d7bd65045e88724ad59a8d7066a9092754c7e4 (patch) | |
| tree | c46b06298abfd41ea470ff9fd75681ec4742b3c7 /gm/color4f.cpp | |
| parent | 65fce9edc44a18e7dc56035cd1bbbd3acc7a7b30 (diff) | |
hide virtual and rename to onMakeComposed
Bug: skia:
Change-Id: Ic18ee2af3273f81ebec9c9031162e808186c0acd
Reviewed-on: https://skia-review.googlesource.com/108300
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/color4f.cpp')
| -rw-r--r-- | gm/color4f.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gm/color4f.cpp b/gm/color4f.cpp index b1ec0bf84b..792f7d58ee 100644 --- a/gm/color4f.cpp +++ b/gm/color4f.cpp @@ -35,14 +35,13 @@ static sk_sp<SkColorFilter> make_cf0() { static sk_sp<SkColorFilter> make_cf1() { SkColorMatrix cm; cm.setSaturation(0.75f); - auto a(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat)); + 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); + return a->makeComposed(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat)); } static sk_sp<SkColorFilter> make_cf2() { |