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

Side by Side Diff: gm/imagefilterscropexpand.cpp

Issue 1842243002: Update SkImageSource to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: clean up 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
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 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 "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkColorFilter.h" 10 #include "SkColorFilter.h"
(...skipping 30 matching lines...) Expand all
41 41
42 void onDraw(SkCanvas* canvas) override { 42 void onDraw(SkCanvas* canvas) override {
43 SkImageFilter::CropRect cropRect( 43 SkImageFilter::CropRect cropRect(
44 SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)), 44 SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)),
45 SkImageFilter::CropRect::kHasAll_CropEdge); 45 SkImageFilter::CropRect::kHasAll_CropEdge);
46 46
47 sk_sp<SkImage> gradientCircle(MakeGradientCircle(64, 64)); 47 sk_sp<SkImage> gradientCircle(MakeGradientCircle(64, 64));
48 SkBitmap checkerboard; 48 SkBitmap checkerboard;
49 MakeCheckerboard(&checkerboard); 49 MakeCheckerboard(&checkerboard);
50 50
51 SkAutoTUnref<SkImageFilter> gradientCircleSource( 51 sk_sp<SkImageFilter> gradientCircleSource(SkImageSource::Make(std::move( gradientCircle)));
52 SkImageSource::Create(gradientCircle.get()));
53 SkAutoTUnref<SkImageFilter> noopCropped( 52 SkAutoTUnref<SkImageFilter> noopCropped(
54 SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect)); 53 SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect));
55 SkScalar sk255 = SkIntToScalar(255); 54 SkScalar sk255 = SkIntToScalar(255);
56 SkScalar matrix[20] = { 1, 0, 0, 0, 0, 55 SkScalar matrix[20] = { 1, 0, 0, 0, 0,
57 0, 1, 0, 0, sk255, 56 0, 1, 0, 0, sk255,
58 0, 0, 1, 0, 0, 57 0, 0, 1, 0, 0,
59 0, 0, 0, 0, sk255 }; 58 0, 0, 0, 0, sk255 };
60 auto cfAlphaTrans(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); 59 auto cfAlphaTrans(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
61 60
62 SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64)); 61 SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 170
172 canvas->translate(SkIntToScalar(80), 0); 171 canvas->translate(SkIntToScalar(80), 0);
173 } 172 }
174 173
175 typedef GM INHERITED; 174 typedef GM INHERITED;
176 }; 175 };
177 176
178 /////////////////////////////////////////////////////////////////////////////// 177 ///////////////////////////////////////////////////////////////////////////////
179 178
180 DEF_GM( return new ImageFiltersCropExpandGM; ) 179 DEF_GM( return new ImageFiltersCropExpandGM; )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698