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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: gm/displacement.cpp

Issue 1877783003: Update DisplacementMapEffect to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix bug 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/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 2013 Google Inc. 2 * Copyright 2013 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 "SkDisplacementMapEffect.h" 8 #include "SkDisplacementMapEffect.h"
9 #include "SkImage.h" 9 #include "SkImage.h"
10 #include "SkImageSource.h" 10 #include "SkImageSource.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); 51 canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
52 canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()), SkIntToS calar(fBitmap.height()))); 52 canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()), SkIntToS calar(fBitmap.height())));
53 canvas->drawBitmap(fBitmap, 0, 0, &paint); 53 canvas->drawBitmap(fBitmap, 0, 0, &paint);
54 canvas->restore(); 54 canvas->restore();
55 } 55 }
56 56
57 void onDraw(SkCanvas* canvas) override { 57 void onDraw(SkCanvas* canvas) override {
58 canvas->clear(SK_ColorBLACK); 58 canvas->clear(SK_ColorBLACK);
59 SkPaint paint; 59 SkPaint paint;
60 sk_sp<SkImageFilter> displ(SkImageSource::Make(fCheckerboard)); 60 sk_sp<SkImageFilter> displ(SkImageSource::Make(fCheckerboard));
61 paint.setImageFilter(SkDisplacementMapEffect::Create( 61 paint.setImageFilter(SkDisplacementMapEffect::Make(
62 SkDisplacementMapEffect::kR_ChannelSelectorType, 62 SkDisplacementMapEffect::kR_ChannelSelectorType,
63 SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ.get())) ->unref(); 63 SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ, nullpt r));
64 drawClippedBitmap(canvas, 0, 0, paint); 64 this->drawClippedBitmap(canvas, 0, 0, paint);
65 paint.setImageFilter(SkDisplacementMapEffect::Create( 65 paint.setImageFilter(SkDisplacementMapEffect::Make(
66 SkDisplacementMapEffect::kB_ChannelSelectorType, 66 SkDisplacementMapEffect::kB_ChannelSelectorType,
67 SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ.get()) )->unref(); 67 SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ, nullp tr));
68 drawClippedBitmap(canvas, 100, 0, paint); 68 this->drawClippedBitmap(canvas, 100, 0, paint);
69 paint.setImageFilter(SkDisplacementMapEffect::Create( 69 paint.setImageFilter(SkDisplacementMapEffect::Make(
70 SkDisplacementMapEffect::kR_ChannelSelectorType, 70 SkDisplacementMapEffect::kR_ChannelSelectorType,
71 SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ.get()) )->unref(); 71 SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ, nullp tr));
72 drawClippedBitmap(canvas, 200, 0, paint); 72 this->drawClippedBitmap(canvas, 200, 0, paint);
73 paint.setImageFilter(SkDisplacementMapEffect::Create( 73 paint.setImageFilter(SkDisplacementMapEffect::Make(
74 SkDisplacementMapEffect::kG_ChannelSelectorType, 74 SkDisplacementMapEffect::kG_ChannelSelectorType,
75 SkDisplacementMapEffect::kA_ChannelSelectorType, 48.0f, displ.get()) )->unref(); 75 SkDisplacementMapEffect::kA_ChannelSelectorType, 48.0f, displ, nullp tr));
76 drawClippedBitmap(canvas, 300, 0, paint); 76 this->drawClippedBitmap(canvas, 300, 0, paint);
77 paint.setImageFilter(SkDisplacementMapEffect::Create( 77 paint.setImageFilter(SkDisplacementMapEffect::Make(
78 SkDisplacementMapEffect::kR_ChannelSelectorType, 78 SkDisplacementMapEffect::kR_ChannelSelectorType,
79 SkDisplacementMapEffect::kA_ChannelSelectorType, 64.0f, displ.get()) )->unref(); 79 SkDisplacementMapEffect::kA_ChannelSelectorType, 64.0f, displ, nullp tr));
80 drawClippedBitmap(canvas, 400, 0, paint); 80 this->drawClippedBitmap(canvas, 400, 0, paint);
81 81
82 paint.setImageFilter(SkDisplacementMapEffect::Create( 82 paint.setImageFilter(SkDisplacementMapEffect::Make(
83 SkDisplacementMapEffect::kR_ChannelSelectorType, 83 SkDisplacementMapEffect::kR_ChannelSelectorType,
84 SkDisplacementMapEffect::kG_ChannelSelectorType, 40.0f, displ.get()) )->unref(); 84 SkDisplacementMapEffect::kG_ChannelSelectorType, 40.0f, displ, nullp tr));
85 drawClippedBitmap(canvas, 0, 100, paint); 85 this->drawClippedBitmap(canvas, 0, 100, paint);
86 paint.setImageFilter(SkDisplacementMapEffect::Create( 86 paint.setImageFilter(SkDisplacementMapEffect::Make(
87 SkDisplacementMapEffect::kB_ChannelSelectorType, 87 SkDisplacementMapEffect::kB_ChannelSelectorType,
88 SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ.get()) )->unref(); 88 SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ, nullp tr));
89 drawClippedBitmap(canvas, 100, 100, paint); 89 this->drawClippedBitmap(canvas, 100, 100, paint);
90 paint.setImageFilter(SkDisplacementMapEffect::Create( 90 paint.setImageFilter(SkDisplacementMapEffect::Make(
91 SkDisplacementMapEffect::kR_ChannelSelectorType, 91 SkDisplacementMapEffect::kR_ChannelSelectorType,
92 SkDisplacementMapEffect::kB_ChannelSelectorType, 40.0f, displ.get()) )->unref(); 92 SkDisplacementMapEffect::kB_ChannelSelectorType, 40.0f, displ, nullp tr));
93 drawClippedBitmap(canvas, 200, 100, paint); 93 this->drawClippedBitmap(canvas, 200, 100, paint);
94 paint.setImageFilter(SkDisplacementMapEffect::Create( 94 paint.setImageFilter(SkDisplacementMapEffect::Make(
95 SkDisplacementMapEffect::kG_ChannelSelectorType, 95 SkDisplacementMapEffect::kG_ChannelSelectorType,
96 SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ.get()) )->unref(); 96 SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ, nullp tr));
97 drawClippedBitmap(canvas, 300, 100, paint); 97 this->drawClippedBitmap(canvas, 300, 100, paint);
98 paint.setImageFilter(SkDisplacementMapEffect::Create( 98 paint.setImageFilter(SkDisplacementMapEffect::Make(
99 SkDisplacementMapEffect::kR_ChannelSelectorType, 99 SkDisplacementMapEffect::kR_ChannelSelectorType,
100 SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ.get()) )->unref(); 100 SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ, nullp tr));
101 drawClippedBitmap(canvas, 400, 100, paint); 101 this->drawClippedBitmap(canvas, 400, 100, paint);
102 102
103 SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(30, 30, 40, 40)); 103 SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(30, 30, 40, 40));
104 paint.setImageFilter(SkDisplacementMapEffect::Create( 104 paint.setImageFilter(SkDisplacementMapEffect::Make(
105 SkDisplacementMapEffect::kR_ChannelSelectorType, 105 SkDisplacementMapEffect::kR_ChannelSelectorType,
106 SkDisplacementMapEffect::kG_ChannelSelectorType, 106 SkDisplacementMapEffect::kG_ChannelSelectorType,
107 0.0f, displ.get(), nullptr, &cropRect))->unref(); 107 0.0f, displ, nullptr, &cropRect));
108 drawClippedBitmap(canvas, 0, 200, paint); 108 this->drawClippedBitmap(canvas, 0, 200, paint);
109 paint.setImageFilter(SkDisplacementMapEffect::Create( 109 paint.setImageFilter(SkDisplacementMapEffect::Make(
110 SkDisplacementMapEffect::kB_ChannelSelectorType, 110 SkDisplacementMapEffect::kB_ChannelSelectorType,
111 SkDisplacementMapEffect::kA_ChannelSelectorType, 111 SkDisplacementMapEffect::kA_ChannelSelectorType,
112 16.0f, displ.get(), nullptr, &cropRect))->unref(); 112 16.0f, displ, nullptr, &cropRect));
113 drawClippedBitmap(canvas, 100, 200, paint); 113 this->drawClippedBitmap(canvas, 100, 200, paint);
114 paint.setImageFilter(SkDisplacementMapEffect::Create( 114 paint.setImageFilter(SkDisplacementMapEffect::Make(
115 SkDisplacementMapEffect::kR_ChannelSelectorType, 115 SkDisplacementMapEffect::kR_ChannelSelectorType,
116 SkDisplacementMapEffect::kB_ChannelSelectorType, 116 SkDisplacementMapEffect::kB_ChannelSelectorType,
117 32.0f, displ.get(), nullptr, &cropRect))->unref(); 117 32.0f, displ, nullptr, &cropRect));
118 drawClippedBitmap(canvas, 200, 200, paint); 118 this->drawClippedBitmap(canvas, 200, 200, paint);
119 paint.setImageFilter(SkDisplacementMapEffect::Create( 119 paint.setImageFilter(SkDisplacementMapEffect::Make(
120 SkDisplacementMapEffect::kG_ChannelSelectorType, 120 SkDisplacementMapEffect::kG_ChannelSelectorType,
121 SkDisplacementMapEffect::kA_ChannelSelectorType, 121 SkDisplacementMapEffect::kA_ChannelSelectorType,
122 48.0f, displ.get(), nullptr, &cropRect))->unref(); 122 48.0f, displ, nullptr, &cropRect));
123 drawClippedBitmap(canvas, 300, 200, paint); 123 this->drawClippedBitmap(canvas, 300, 200, paint);
124 paint.setImageFilter(SkDisplacementMapEffect::Create( 124 paint.setImageFilter(SkDisplacementMapEffect::Make(
125 SkDisplacementMapEffect::kR_ChannelSelectorType, 125 SkDisplacementMapEffect::kR_ChannelSelectorType,
126 SkDisplacementMapEffect::kA_ChannelSelectorType, 126 SkDisplacementMapEffect::kA_ChannelSelectorType,
127 64.0f, displ.get(), nullptr, &cropRect))->unref(); 127 64.0f, displ, nullptr, &cropRect));
128 drawClippedBitmap(canvas, 400, 200, paint); 128 this->drawClippedBitmap(canvas, 400, 200, paint);
129 129
130 paint.setImageFilter(SkDisplacementMapEffect::Create( 130 paint.setImageFilter(SkDisplacementMapEffect::Make(
131 SkDisplacementMapEffect::kR_ChannelSelectorType, 131 SkDisplacementMapEffect::kR_ChannelSelectorType,
132 SkDisplacementMapEffect::kG_ChannelSelectorType, 132 SkDisplacementMapEffect::kG_ChannelSelectorType,
133 40.0f, displ.get(), nullptr, &cropRect))->unref(); 133 40.0f, displ, nullptr, &cropRect));
134 drawClippedBitmap(canvas, 0, 300, paint); 134 this->drawClippedBitmap(canvas, 0, 300, paint);
135 paint.setImageFilter(SkDisplacementMapEffect::Create( 135 paint.setImageFilter(SkDisplacementMapEffect::Make(
136 SkDisplacementMapEffect::kB_ChannelSelectorType, 136 SkDisplacementMapEffect::kB_ChannelSelectorType,
137 SkDisplacementMapEffect::kA_ChannelSelectorType, 137 SkDisplacementMapEffect::kA_ChannelSelectorType,
138 40.0f, displ.get(), nullptr, &cropRect))->unref(); 138 40.0f, displ, nullptr, &cropRect));
139 drawClippedBitmap(canvas, 100, 300, paint); 139 this->drawClippedBitmap(canvas, 100, 300, paint);
140 paint.setImageFilter(SkDisplacementMapEffect::Create( 140 paint.setImageFilter(SkDisplacementMapEffect::Make(
141 SkDisplacementMapEffect::kR_ChannelSelectorType, 141 SkDisplacementMapEffect::kR_ChannelSelectorType,
142 SkDisplacementMapEffect::kB_ChannelSelectorType, 142 SkDisplacementMapEffect::kB_ChannelSelectorType,
143 40.0f, displ.get(), nullptr, &cropRect))->unref(); 143 40.0f, displ, nullptr, &cropRect));
144 drawClippedBitmap(canvas, 200, 300, paint); 144 this->drawClippedBitmap(canvas, 200, 300, paint);
145 paint.setImageFilter(SkDisplacementMapEffect::Create( 145 paint.setImageFilter(SkDisplacementMapEffect::Make(
146 SkDisplacementMapEffect::kG_ChannelSelectorType, 146 SkDisplacementMapEffect::kG_ChannelSelectorType,
147 SkDisplacementMapEffect::kA_ChannelSelectorType, 147 SkDisplacementMapEffect::kA_ChannelSelectorType,
148 40.0f, displ.get(), nullptr, &cropRect))->unref(); 148 40.0f, displ, nullptr, &cropRect));
149 drawClippedBitmap(canvas, 300, 300, paint); 149 this->drawClippedBitmap(canvas, 300, 300, paint);
150 paint.setImageFilter(SkDisplacementMapEffect::Create( 150 paint.setImageFilter(SkDisplacementMapEffect::Make(
151 SkDisplacementMapEffect::kR_ChannelSelectorType, 151 SkDisplacementMapEffect::kR_ChannelSelectorType,
152 SkDisplacementMapEffect::kA_ChannelSelectorType, 152 SkDisplacementMapEffect::kA_ChannelSelectorType,
153 40.0f, displ.get(), nullptr, &cropRect))->unref(); 153 40.0f, displ, nullptr, &cropRect));
154 drawClippedBitmap(canvas, 400, 300, paint); 154 this->drawClippedBitmap(canvas, 400, 300, paint);
155 155
156 // Test for negative scale. 156 // Test for negative scale.
157 paint.setImageFilter(SkDisplacementMapEffect::Create( 157 paint.setImageFilter(SkDisplacementMapEffect::Make(
158 SkDisplacementMapEffect::kG_ChannelSelectorType, 158 SkDisplacementMapEffect::kG_ChannelSelectorType,
159 SkDisplacementMapEffect::kA_ChannelSelectorType, 159 SkDisplacementMapEffect::kA_ChannelSelectorType,
160 -40.0f, displ.get()))->unref(); 160 -40.0f, displ, nullptr));
161 this->drawClippedBitmap(canvas, 500, 0, paint); 161 this->drawClippedBitmap(canvas, 500, 0, paint);
162 162
163 // Tests for images of different sizes 163 // Tests for images of different sizes
164 displ = SkImageSource::Make(fSmall); 164 displ = SkImageSource::Make(fSmall);
165 paint.setImageFilter(SkDisplacementMapEffect::Create( 165 paint.setImageFilter(SkDisplacementMapEffect::Make(
166 SkDisplacementMapEffect::kR_ChannelSelectorType, 166 SkDisplacementMapEffect::kR_ChannelSelectorType,
167 SkDisplacementMapEffect::kG_ChannelSelectorType, 167 SkDisplacementMapEffect::kG_ChannelSelectorType,
168 40.0f, displ.get()))->unref(); 168 40.0f, std::move(displ), nullptr));
169 drawClippedBitmap(canvas, 0, 400, paint); 169 this->drawClippedBitmap(canvas, 0, 400, paint);
170 displ = SkImageSource::Make(fLarge); 170 displ = SkImageSource::Make(fLarge);
171 paint.setImageFilter(SkDisplacementMapEffect::Create( 171 paint.setImageFilter(SkDisplacementMapEffect::Make(
172 SkDisplacementMapEffect::kB_ChannelSelectorType, 172 SkDisplacementMapEffect::kB_ChannelSelectorType,
173 SkDisplacementMapEffect::kA_ChannelSelectorType, 173 SkDisplacementMapEffect::kA_ChannelSelectorType,
174 40.0f, displ.get()))->unref(); 174 40.0f, std::move(displ), nullptr));
175 drawClippedBitmap(canvas, 100, 400, paint); 175 this->drawClippedBitmap(canvas, 100, 400, paint);
176 displ = SkImageSource::Make(fLargeW); 176 displ = SkImageSource::Make(fLargeW);
177 paint.setImageFilter(SkDisplacementMapEffect::Create( 177 paint.setImageFilter(SkDisplacementMapEffect::Make(
178 SkDisplacementMapEffect::kR_ChannelSelectorType, 178 SkDisplacementMapEffect::kR_ChannelSelectorType,
179 SkDisplacementMapEffect::kB_ChannelSelectorType, 179 SkDisplacementMapEffect::kB_ChannelSelectorType,
180 40.0f, displ.get()))->unref(); 180 40.0f, std::move(displ), nullptr));
181 drawClippedBitmap(canvas, 200, 400, paint); 181 this->drawClippedBitmap(canvas, 200, 400, paint);
182 displ = SkImageSource::Make(fLargeH); 182 displ = SkImageSource::Make(fLargeH);
183 paint.setImageFilter(SkDisplacementMapEffect::Create( 183 paint.setImageFilter(SkDisplacementMapEffect::Make(
184 SkDisplacementMapEffect::kG_ChannelSelectorType, 184 SkDisplacementMapEffect::kG_ChannelSelectorType,
185 SkDisplacementMapEffect::kA_ChannelSelectorType, 185 SkDisplacementMapEffect::kA_ChannelSelectorType,
186 40.0f, displ.get()))->unref(); 186 40.0f, std::move(displ), nullptr));
187 drawClippedBitmap(canvas, 300, 400, paint); 187 this->drawClippedBitmap(canvas, 300, 400, paint);
188 188
189 // Test for no given displacement input. In this case, both displacement 189 // Test for no given displacement input. In this case, both displacement
190 // and color should use the same bitmap, given to SkCanvas::drawBitmap() 190 // and color should use the same bitmap, given to SkCanvas::drawBitmap()
191 // as an input argument. 191 // as an input argument.
192 paint.setImageFilter(SkDisplacementMapEffect::Create( 192 paint.setImageFilter(SkDisplacementMapEffect::Make(
193 SkDisplacementMapEffect::kG_ChannelSelectorType, 193 SkDisplacementMapEffect::kG_ChannelSelectorType,
194 SkDisplacementMapEffect::kA_ChannelSelectorType, 194 SkDisplacementMapEffect::kA_ChannelSelectorType,
195 40.0f, nullptr))->unref(); 195 40.0f, nullptr, nullptr));
196 drawClippedBitmap(canvas, 400, 400, paint); 196 this->drawClippedBitmap(canvas, 400, 400, paint);
197 } 197 }
198 198
199 private: 199 private:
200 SkBitmap fBitmap; 200 SkBitmap fBitmap;
201 sk_sp<SkImage> fCheckerboard, fSmall, fLarge, fLargeW, fLargeH; 201 sk_sp<SkImage> fCheckerboard, fSmall, fLarge, fLargeW, fLargeH;
202 202
203 typedef GM INHERITED; 203 typedef GM INHERITED;
204 }; 204 };
205 205
206 ////////////////////////////////////////////////////////////////////////////// 206 //////////////////////////////////////////////////////////////////////////////
207 207
208 DEF_GM(return new DisplacementMapGM;) 208 DEF_GM(return new DisplacementMapGM;)
209 } 209 }
OLDNEW
« no previous file with comments | « fuzz/FilterFuzz.cpp ('k') | gm/imagefiltersclipped.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698