Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: gm/imagefilters.cpp

Issue 1858353002: Update SkMatrixImageFilter to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix fuzz Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gm/filterfastbounds.cpp ('k') | gm/imagefiltersclipped.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "gm.h" 8 #include "gm.h"
9 #include "SkBlurImageFilter.h" 9 #include "SkBlurImageFilter.h"
10 #include "SkColorMatrixFilter.h" 10 #include "SkColorMatrixFilter.h"
11 #include "SkImage.h" 11 #include "SkImage.h"
12 #include "SkImageFilter.h" 12 #include "SkImageFilter.h"
13 #include "SkSurface.h" 13 #include "SkSurface.h"
14 14
15 /** 15 /**
16 * Test drawing a primitive w/ an imagefilter (in this case, just matrix w/ ide ntity) to see 16 * Test drawing a primitive w/ an imagefilter (in this case, just matrix w/ ide ntity) to see
17 * that we apply the xfermode *after* the image has been created and filtered, and not during 17 * that we apply the xfermode *after* the image has been created and filtered, and not during
18 * the creation step (i.e. before it is filtered). 18 * the creation step (i.e. before it is filtered).
19 * 19 *
20 * see https://bug.skia.org/3741 20 * see https://bug.skia.org/3741
21 */ 21 */
22 static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, SkImageFilter* imf) { 22 static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, sk_sp<SkImageFilter > imf) {
23 SkAutoCanvasRestore acr(canvas, true); 23 SkAutoCanvasRestore acr(canvas, true);
24 canvas->clipRect(SkRect::MakeWH(220, 220)); 24 canvas->clipRect(SkRect::MakeWH(220, 220));
25 25
26 // want to force a layer, so modes like DstIn can combine meaningfully, but the final 26 // want to force a layer, so modes like DstIn can combine meaningfully, but the final
27 // image can still be shown against our default (opaque) background. non -opaque GMs 27 // image can still be shown against our default (opaque) background. non -opaque GMs
28 // are a lot more trouble to compare/triage. 28 // are a lot more trouble to compare/triage.
29 canvas->saveLayer(nullptr, nullptr); 29 canvas->saveLayer(nullptr, nullptr);
30 canvas->drawColor(SK_ColorGREEN); 30 canvas->drawColor(SK_ColorGREEN);
31 31
32 SkPaint paint; 32 SkPaint paint;
33 paint.setAntiAlias(true); 33 paint.setAntiAlias(true);
34 34
35 SkRect r0 = SkRect::MakeXYWH(10, 60, 200, 100); 35 SkRect r0 = SkRect::MakeXYWH(10, 60, 200, 100);
36 SkRect r1 = SkRect::MakeXYWH(60, 10, 100, 200); 36 SkRect r1 = SkRect::MakeXYWH(60, 10, 100, 200);
37 37
38 paint.setColor(SK_ColorRED); 38 paint.setColor(SK_ColorRED);
39 canvas->drawOval(r0, paint); 39 canvas->drawOval(r0, paint);
40 40
41 paint.setColor(0x660000FF); 41 paint.setColor(0x660000FF);
42 paint.setImageFilter(imf); 42 paint.setImageFilter(std::move(imf));
43 paint.setXfermodeMode(mode); 43 paint.setXfermodeMode(mode);
44 canvas->drawOval(r1, paint); 44 canvas->drawOval(r1, paint);
45 } 45 }
46 46
47 DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) { 47 DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) {
48 canvas->translate(10, 10); 48 canvas->translate(10, 10);
49 49
50 // just need an imagefilter to trigger the code-path (which creates a tm p layer) 50 // just need an imagefilter to trigger the code-path (which creates a tm p layer)
51 SkAutoTUnref<SkImageFilter> imf(SkImageFilter::CreateMatrixFilter(SkMatr ix::I(), 51 sk_sp<SkImageFilter> imf(SkImageFilter::MakeMatrixFilter(SkMatrix::I(),
52 kNone_ SkFilterQuality)); 52 kNone_SkFilterQ uality,
53 nullptr));
53 54
54 const SkXfermode::Mode modes[] = { 55 const SkXfermode::Mode modes[] = {
55 SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode 56 SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode
56 }; 57 };
57 58
58 for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) { 59 for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) {
59 canvas->save(); 60 canvas->save();
60 do_draw(canvas, modes[i], nullptr); 61 do_draw(canvas, modes[i], nullptr);
61 canvas->translate(240, 0); 62 canvas->translate(240, 0);
62 do_draw(canvas, modes[i], imf); 63 do_draw(canvas, modes[i], imf);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 canvas->scale(xform.fSx, xform.fSy); 171 canvas->scale(xform.fSx, xform.fSy);
171 canvas->drawImage(image, 0, 0, &paint); 172 canvas->drawImage(image, 0, 0, &paint);
172 draw_set(canvas, filters, SK_ARRAY_COUNT(filters)); 173 draw_set(canvas, filters, SK_ARRAY_COUNT(filters));
173 canvas->restore(); 174 canvas->restore();
174 } 175 }
175 176
176 for (auto& filter : filters) { 177 for (auto& filter : filters) {
177 filter->unref(); 178 filter->unref();
178 } 179 }
179 } 180 }
OLDNEW
« no previous file with comments | « gm/filterfastbounds.cpp ('k') | gm/imagefiltersclipped.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698