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

Side by Side Diff: gm/imagefilters.cpp

Issue 1869833002: Update MatrixConvolutionImageFilter to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update to ToT 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 | « fuzz/FilterFuzz.cpp ('k') | gm/imagefiltersgraph.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"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 //////////////////////////////////////////////////////////////////////////////// /////////////////// 108 //////////////////////////////////////////////////////////////////////////////// ///////////////////
109 #include "Resources.h" 109 #include "Resources.h"
110 #include "SkBlurImageFilter.h" 110 #include "SkBlurImageFilter.h"
111 #include "SkMatrixConvolutionImageFilter.h" 111 #include "SkMatrixConvolutionImageFilter.h"
112 #include "SkMorphologyImageFilter.h" 112 #include "SkMorphologyImageFilter.h"
113 #include "SkColorMatrixFilter.h" 113 #include "SkColorMatrixFilter.h"
114 #include "SkColorFilterImageFilter.h" 114 #include "SkColorFilterImageFilter.h"
115 #include "SkRRect.h" 115 #include "SkRRect.h"
116 116
117 static void draw_set(SkCanvas* canvas, SkImageFilter* filters[], int count) { 117 static void draw_set(SkCanvas* canvas, sk_sp<SkImageFilter> filters[], int count ) {
118 const SkRect r = SkRect::MakeXYWH(30, 30, 200, 200); 118 const SkRect r = SkRect::MakeXYWH(30, 30, 200, 200);
119 const SkScalar offset = 250; 119 const SkScalar offset = 250;
120 SkScalar dx = 0, dy = 0; 120 SkScalar dx = 0, dy = 0;
121 121
122 for (int i = 0; i < count; ++i) { 122 for (int i = 0; i < count; ++i) {
123 canvas->save(); 123 canvas->save();
124 SkRRect rr = SkRRect::MakeRectXY(r.makeOffset(dx, dy), 20, 20); 124 SkRRect rr = SkRRect::MakeRectXY(r.makeOffset(dx, dy), 20, 20);
125 canvas->clipRRect(rr, SkRegion::kIntersect_Op, true); 125 canvas->clipRRect(rr, SkRegion::kIntersect_Op, true);
126 canvas->saveLayer({ &rr.getBounds(), nullptr, filters[i], 0 }); 126 canvas->saveLayer({ &rr.getBounds(), nullptr, filters[i].get(), 0 });
127 canvas->drawColor(0x40FFFFFF); 127 canvas->drawColor(0x40FFFFFF);
128 canvas->restore(); 128 canvas->restore();
129 canvas->restore(); 129 canvas->restore();
130 130
131 if (0 == dx) { 131 if (0 == dx) {
132 dx = offset; 132 dx = offset;
133 } else { 133 } else {
134 dx = 0; 134 dx = 0;
135 dy = offset; 135 dy = offset;
136 } 136 }
137 } 137 }
138 } 138 }
139 139
140 DEF_SIMPLE_GM(savelayer_with_backdrop, canvas, 830, 550) { 140 DEF_SIMPLE_GM(savelayer_with_backdrop, canvas, 830, 550) {
141 SkColorMatrix cm; 141 SkColorMatrix cm;
142 cm.setSaturation(10); 142 cm.setSaturation(10);
143 sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat)) ; 143 sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat)) ;
144 const SkScalar kernel[] = { 4, 0, 4, 0, -15, 0, 4, 0, 4 }; 144 const SkScalar kernel[] = { 4, 0, 4, 0, -15, 0, 4, 0, 4 };
145 SkImageFilter* filters[] = { 145 sk_sp<SkImageFilter> filters[] = {
146 SkBlurImageFilter::Make(10, 10, nullptr).release(), 146 SkBlurImageFilter::Make(10, 10, nullptr),
147 SkDilateImageFilter::Make(8, 8, nullptr).release(), 147 SkDilateImageFilter::Make(8, 8, nullptr),
148 SkMatrixConvolutionImageFilter::Create({ 3, 3 }, kernel, 1, 0, { 0, 0 }, 148 SkMatrixConvolutionImageFilter::Make(
149 { 3, 3 }, kernel, 1, 0, { 0, 0 },
149 SkMatrixConvolutionImageFilter::kClam pToBlack_TileMode, 150 SkMatrixConvolutionImageFilter::kClam pToBlack_TileMode,
150 true), 151 true, nullptr),
151 SkColorFilterImageFilter::Make(std::move(cf), nullptr).release(), 152 SkColorFilterImageFilter::Make(std::move(cf), nullptr),
152 }; 153 };
153 154
154 const struct { 155 const struct {
155 SkScalar fSx, fSy, fTx, fTy; 156 SkScalar fSx, fSy, fTx, fTy;
156 } xforms[] = { 157 } xforms[] = {
157 { 1, 1, 0, 0 }, 158 { 1, 1, 0, 0 },
158 { 0.5f, 0.5f, 530, 0 }, 159 { 0.5f, 0.5f, 530, 0 },
159 { 0.25f, 0.25f, 530, 275 }, 160 { 0.25f, 0.25f, 530, 275 },
160 { 0.125f, 0.125f, 530, 420 }, 161 { 0.125f, 0.125f, 530, 420 },
161 }; 162 };
162 163
163 SkPaint paint; 164 SkPaint paint;
164 paint.setFilterQuality(kMedium_SkFilterQuality); 165 paint.setFilterQuality(kMedium_SkFilterQuality);
165 sk_sp<SkImage> image(GetResourceAsImage("mandrill_512.png")); 166 sk_sp<SkImage> image(GetResourceAsImage("mandrill_512.png"));
166 167
167 canvas->translate(20, 20); 168 canvas->translate(20, 20);
168 for (const auto& xform : xforms) { 169 for (const auto& xform : xforms) {
169 canvas->save(); 170 canvas->save();
170 canvas->translate(xform.fTx, xform.fTy); 171 canvas->translate(xform.fTx, xform.fTy);
171 canvas->scale(xform.fSx, xform.fSy); 172 canvas->scale(xform.fSx, xform.fSy);
172 canvas->drawImage(image, 0, 0, &paint); 173 canvas->drawImage(image, 0, 0, &paint);
173 draw_set(canvas, filters, SK_ARRAY_COUNT(filters)); 174 draw_set(canvas, filters, SK_ARRAY_COUNT(filters));
174 canvas->restore(); 175 canvas->restore();
175 } 176 }
176
177 for (auto& filter : filters) {
178 filter->unref();
179 }
180 } 177 }
OLDNEW
« no previous file with comments | « fuzz/FilterFuzz.cpp ('k') | gm/imagefiltersgraph.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698