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

Side by Side Diff: gm/imagefilterscropped.cpp

Issue 1825073002: Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove flag Created 4 years, 9 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/imagefilterscropexpand.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 2011 Google Inc. 2 * Copyright 2011 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 virtual void onOnceBeforeDraw() override{ 109 virtual void onOnceBeforeDraw() override{
110 make_checkerboard(); 110 make_checkerboard();
111 } 111 }
112 112
113 virtual void onDraw(SkCanvas* canvas) override { 113 virtual void onDraw(SkCanvas* canvas) override {
114 void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = { 114 void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
115 draw_bitmap, draw_path, draw_paint, draw_text 115 draw_bitmap, draw_path, draw_paint, draw_text
116 }; 116 };
117 117
118 SkAutoTUnref<SkColorFilter> cf( 118 auto cf(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_M ode));
119 SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mod e));
120 SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)), SkImageFilter::CropRect::kHasAll_CropEdge); 119 SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)), SkImageFilter::CropRect::kHasAll_CropEdge);
121 SkImageFilter::CropRect bogusRect(SkRect::Make(SkIRect::MakeXYWH(-100, - 100, 10, 10)), SkImageFilter::CropRect::kHasAll_CropEdge); 120 SkImageFilter::CropRect bogusRect(SkRect::Make(SkIRect::MakeXYWH(-100, - 100, 10, 10)), SkImageFilter::CropRect::kHasAll_CropEdge);
122 121
123 SkAutoTUnref<SkImageFilter> offset(SkOffsetImageFilter::Create( 122 SkAutoTUnref<SkImageFilter> offset(SkOffsetImageFilter::Create(
124 SkIntToScalar(-10), SkIntToScalar(-10))); 123 SkIntToScalar(-10), SkIntToScalar(-10)));
125 124
126 SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf .get(), offset.get())); 125 SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf .get(), offset.get()));
127 126
128 SkAutoTUnref<SkImageFilter> erodeX(SkErodeImageFilter::Create(8, 0, null ptr, &cropRect)); 127 SkAutoTUnref<SkImageFilter> erodeX(SkErodeImageFilter::Create(8, 0, null ptr, &cropRect));
129 SkAutoTUnref<SkImageFilter> erodeY(SkErodeImageFilter::Create(0, 8, null ptr, &cropRect)); 128 SkAutoTUnref<SkImageFilter> erodeY(SkErodeImageFilter::Create(0, 8, null ptr, &cropRect));
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 168 }
170 169
171 private: 170 private:
172 SkBitmap fCheckerboard; 171 SkBitmap fCheckerboard;
173 typedef GM INHERITED; 172 typedef GM INHERITED;
174 }; 173 };
175 174
176 /////////////////////////////////////////////////////////////////////////////// 175 ///////////////////////////////////////////////////////////////////////////////
177 176
178 DEF_GM( return new ImageFiltersCroppedGM; ) 177 DEF_GM( return new ImageFiltersCroppedGM; )
OLDNEW
« no previous file with comments | « gm/imagefilterscropexpand.cpp ('k') | gm/imagefiltersgraph.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698