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

Side by Side Diff: gm/imagefilters.cpp

Issue 1518643002: SkBlurImageFilter returns input when sigma = 0 (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: clean up Created 5 years 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/imageblurtiled.cpp ('k') | include/effects/SkBlurImageFilter.h » ('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, 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(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 SkAutoTUnref<SkImageFilter> imf(SkImageFilter::CreateMatrixFilter(SkMatr ix::I(),
52 kNone_ SkFilterQuality)); 52 kNone_ SkFilterQuality));
53 53
54 const SkXfermode::Mode modes[] = { 54 const SkXfermode::Mode modes[] = {
55 SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode 55 SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode
56 }; 56 };
57 57
58 for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) { 58 for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) {
59 canvas->save(); 59 canvas->save();
60 do_draw(canvas, modes[i], nullptr); 60 do_draw(canvas, modes[i], nullptr);
61 canvas->translate(240, 0); 61 canvas->translate(240, 0);
62 do_draw(canvas, modes[i], imf); 62 do_draw(canvas, modes[i], imf);
63 canvas->restore(); 63 canvas->restore();
64 64
65 canvas->translate(0, 240); 65 canvas->translate(0, 240);
66 } 66 }
67 } 67 }
68 68
69 static SkImage* make_image(SkCanvas* canvas) { 69 static SkImage* make_image(SkCanvas* canvas) {
70 const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); 70 const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
71 SkAutoTUnref<SkSurface> surface(canvas->newSurface(info)); 71 SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
72 if (!surface) { 72 if (!surface) {
73 surface.reset(SkSurface::NewRaster(info)); 73 surface.reset(SkSurface::NewRaster(info));
74 } 74 }
75 surface->getCanvas()->drawRect(SkRect::MakeXYWH(25, 25, 50, 50), SkPaint()); 75 surface->getCanvas()->drawRect(SkRect::MakeXYWH(25, 25, 50, 50), SkPaint());
76 return surface->newImageSnapshot(); 76 return surface->newImageSnapshot();
77 } 77 }
78 78
79 // Compare blurs when we're tightly clipped (fast) and not as tightly (slower) 79 // Compare blurs when we're tightly clipped (fast) and not as tightly (slower)
80 // 80 //
81 // Expect the two to draw the same (modulo the extra border of pixels when the c lip is larger) 81 // Expect the two to draw the same (modulo the extra border of pixels when the c lip is larger)
82 // 82 //
83 DEF_SIMPLE_GM(fast_slow_blurimagefilter, canvas, 620, 260) { 83 DEF_SIMPLE_GM(fast_slow_blurimagefilter, canvas, 620, 260) {
84 SkAutoTUnref<SkImage> image(make_image(canvas)); 84 SkAutoTUnref<SkImage> image(make_image(canvas));
85 const SkRect r = SkRect::MakeIWH(image->width(), image->height()); 85 const SkRect r = SkRect::MakeIWH(image->width(), image->height());
86 86
87 canvas->translate(10, 10); 87 canvas->translate(10, 10);
88 for (SkScalar sigma = 8; sigma <= 128; sigma *= 2) { 88 for (SkScalar sigma = 8; sigma <= 128; sigma *= 2) {
89 SkPaint paint; 89 SkPaint paint;
90 paint.setImageFilter(SkBlurImageFilter::Create(sigma, sigma))->unref(); 90 SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(sigma, sigma) );
91 paint.setImageFilter(blur);
91 92
92 canvas->save(); 93 canvas->save();
93 // we outset the clip by 1, to fall out of the fast-case in drawImage 94 // we outset the clip by 1, to fall out of the fast-case in drawImage
94 // i.e. the clip is larger than the image 95 // i.e. the clip is larger than the image
95 for (SkScalar outset = 0; outset <= 1; ++outset) { 96 for (SkScalar outset = 0; outset <= 1; ++outset) {
96 canvas->save(); 97 canvas->save();
97 canvas->clipRect(r.makeOutset(outset, outset)); 98 canvas->clipRect(r.makeOutset(outset, outset));
98 canvas->drawImage(image, 0, 0, &paint); 99 canvas->drawImage(image, 0, 0, &paint);
99 canvas->restore(); 100 canvas->restore();
100 canvas->translate(0, r.height() + 20); 101 canvas->translate(0, r.height() + 20);
101 } 102 }
102 canvas->restore(); 103 canvas->restore();
103 canvas->translate(r.width() + 20, 0); 104 canvas->translate(r.width() + 20, 0);
104 } 105 }
105 } 106 }
OLDNEW
« no previous file with comments | « gm/imageblurtiled.cpp ('k') | include/effects/SkBlurImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698