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

Side by Side Diff: gm/tileimagefilter.cpp

Issue 1882113002: Update TileImageFilter 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 | « gm/filterfastbounds.cpp ('k') | include/effects/SkTileImageFilter.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 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 "sk_tool_utils.h" 8 #include "sk_tool_utils.h"
9 #include "SkColorFilterImageFilter.h" 9 #include "SkColorFilterImageFilter.h"
10 #include "SkColorMatrixFilter.h" 10 #include "SkColorMatrixFilter.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 sk_sp<SkImage> image = (i & 0x01) ? fCheckerboard : fBitmap; 59 sk_sp<SkImage> image = (i & 0x01) ? fCheckerboard : fBitmap;
60 SkRect srcRect = SkRect::MakeXYWH(SkIntToScalar(image->width()/4), 60 SkRect srcRect = SkRect::MakeXYWH(SkIntToScalar(image->width()/4),
61 SkIntToScalar(image->height()/4), 61 SkIntToScalar(image->height()/4),
62 SkIntToScalar(image->width()/(i+1) ), 62 SkIntToScalar(image->width()/(i+1) ),
63 SkIntToScalar(image->height()/(i+1 ))); 63 SkIntToScalar(image->height()/(i+1 )));
64 SkRect dstRect = SkRect::MakeXYWH(SkIntToScalar(i * 8), 64 SkRect dstRect = SkRect::MakeXYWH(SkIntToScalar(i * 8),
65 SkIntToScalar(i * 4), 65 SkIntToScalar(i * 4),
66 SkIntToScalar(image->width() - i * 12), 66 SkIntToScalar(image->width() - i * 12),
67 SkIntToScalar(image->height()) - i * 12); 67 SkIntToScalar(image->height()) - i * 12);
68 sk_sp<SkImageFilter> tileInput(SkImageSource::Make(image)); 68 sk_sp<SkImageFilter> tileInput(SkImageSource::Make(image));
69 sk_sp<SkImageFilter> filter(SkTileImageFilter::Create(srcRect, dstRe ct, tileInput.get())); 69 sk_sp<SkImageFilter> filter(SkTileImageFilter::Make(srcRect,
70 dstRect,
71 std::move(tileIn put)));
70 canvas->save(); 72 canvas->save();
71 canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); 73 canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
72 SkPaint paint; 74 SkPaint paint;
73 paint.setImageFilter(std::move(filter)); 75 paint.setImageFilter(std::move(filter));
74 canvas->drawImage(fBitmap.get(), 0, 0, &paint); 76 canvas->drawImage(fBitmap.get(), 0, 0, &paint);
75 canvas->drawRect(srcRect, red); 77 canvas->drawRect(srcRect, red);
76 canvas->drawRect(dstRect, blue); 78 canvas->drawRect(dstRect, blue);
77 canvas->restore(); 79 canvas->restore();
78 x += image->width() + MARGIN; 80 x += image->width() + MARGIN;
79 if (x + image->width() > WIDTH) { 81 if (x + image->width() > WIDTH) {
80 x = 0; 82 x = 0;
81 y += image->height() + MARGIN; 83 y += image->height() + MARGIN;
82 } 84 }
83 } 85 }
84 86
85 SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0, 87 SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
86 0, SK_Scalar1, 0, 0, 0, 88 0, SK_Scalar1, 0, 0, 0,
87 0, 0, SK_Scalar1, 0, 0, 89 0, 0, SK_Scalar1, 0, 0,
88 0, 0, 0, SK_Scalar1, 0 }; 90 0, 0, 0, SK_Scalar1, 0 };
89 91
90 SkRect srcRect = SkRect::MakeWH(SkIntToScalar(fBitmap->width()), 92 SkRect srcRect = SkRect::MakeWH(SkIntToScalar(fBitmap->width()),
91 SkIntToScalar(fBitmap->height())); 93 SkIntToScalar(fBitmap->height()));
92 SkRect dstRect = SkRect::MakeWH(SkIntToScalar(fBitmap->width() * 2), 94 SkRect dstRect = SkRect::MakeWH(SkIntToScalar(fBitmap->width() * 2),
93 SkIntToScalar(fBitmap->height() * 2)); 95 SkIntToScalar(fBitmap->height() * 2));
94 sk_sp<SkImageFilter> tile(SkTileImageFilter::Create(srcRect, dstRect, nu llptr)); 96 sk_sp<SkImageFilter> tile(SkTileImageFilter::Make(srcRect, dstRect, null ptr));
95 sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(matri x)); 97 sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(matri x));
96 98
97 SkPaint paint; 99 SkPaint paint;
98 paint.setImageFilter(SkColorFilterImageFilter::Make(std::move(cf), std:: move(tile))); 100 paint.setImageFilter(SkColorFilterImageFilter::Make(std::move(cf), std:: move(tile)));
99 canvas->save(); 101 canvas->save();
100 canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); 102 canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
101 canvas->clipRect(dstRect); 103 canvas->clipRect(dstRect);
102 canvas->saveLayer(&dstRect, &paint); 104 canvas->saveLayer(&dstRect, &paint);
103 canvas->drawImage(fBitmap.get(), 0, 0); 105 canvas->drawImage(fBitmap.get(), 0, 0);
104 canvas->restore(); 106 canvas->restore();
105 canvas->drawRect(srcRect, red); 107 canvas->drawRect(srcRect, red);
106 canvas->drawRect(dstRect, blue); 108 canvas->drawRect(dstRect, blue);
107 canvas->restore(); 109 canvas->restore();
108 110
109 canvas->translate(0, SkIntToScalar(100)); 111 canvas->translate(0, SkIntToScalar(100));
110 112
111 srcRect = SkRect::MakeXYWH(0, 0, 50, 50); 113 srcRect = SkRect::MakeXYWH(0, 0, 50, 50);
112 dstRect = SkRect::MakeXYWH(0, 0, 100, 100); 114 dstRect = SkRect::MakeXYWH(0, 0, 100, 100);
113 SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(5, 5, 40, 40)); 115 SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(5, 5, 40, 40));
114 sk_sp<SkColorFilter> greenCF = SkColorFilter::MakeModeFilter(SK_ColorGRE EN, 116 sk_sp<SkColorFilter> greenCF = SkColorFilter::MakeModeFilter(SK_ColorGRE EN,
115 SkXfermode: :kSrc_Mode); 117 SkXfermode: :kSrc_Mode);
116 sk_sp<SkImageFilter> green(SkColorFilterImageFilter::Make(std::move(gree nCF), 118 sk_sp<SkImageFilter> green(SkColorFilterImageFilter::Make(std::move(gree nCF),
117 nullptr, 119 nullptr,
118 &cropRect)); 120 &cropRect));
119 tile.reset(SkTileImageFilter::Create(srcRect, dstRect, green.get())); 121 tile = SkTileImageFilter::Make(srcRect, dstRect, std::move(green));
120 paint.setColor(SK_ColorRED); 122 paint.setColor(SK_ColorRED);
121 paint.setImageFilter(std::move(tile)); 123 paint.setImageFilter(std::move(tile));
122 canvas->drawRect(dstRect, paint); 124 canvas->drawRect(dstRect, paint);
123 } 125 }
124 private: 126 private:
125 sk_sp<SkImage> fBitmap, fCheckerboard; 127 sk_sp<SkImage> fBitmap, fCheckerboard;
126 128
127 typedef GM INHERITED; 129 typedef GM INHERITED;
128 }; 130 };
129 131
130 ////////////////////////////////////////////////////////////////////////////// 132 //////////////////////////////////////////////////////////////////////////////
131 133
132 DEF_GM(return new TileImageFilterGM;) 134 DEF_GM(return new TileImageFilterGM;)
133 } 135 }
OLDNEW
« no previous file with comments | « gm/filterfastbounds.cpp ('k') | include/effects/SkTileImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698