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

Side by Side Diff: gm/imagefiltersscaled.cpp

Issue 182983003: Factory methods for heap-allocated SkImageFilter objects. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: reed's nits Created 6 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
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 "SkColor.h" 9 #include "SkColor.h"
10 #include "SkBitmapSource.h" 10 #include "SkBitmapSource.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 77 }
78 78
79 virtual void onDraw(SkCanvas* canvas) { 79 virtual void onDraw(SkCanvas* canvas) {
80 if (!fInitialized) { 80 if (!fInitialized) {
81 this->make_checkerboard(); 81 this->make_checkerboard();
82 this->make_gradient_circle(64, 64); 82 this->make_gradient_circle(64, 64);
83 fInitialized = true; 83 fInitialized = true;
84 } 84 }
85 canvas->clear(0x00000000); 85 canvas->clear(0x00000000);
86 86
87 SkAutoTUnref<SkImageFilter> gradient(new SkBitmapSource(fGradientCircle) ); 87 SkAutoTUnref<SkImageFilter> gradient(SkBitmapSource::Create(fGradientCir cle));
88 SkAutoTUnref<SkImageFilter> checkerboard(new SkBitmapSource(fCheckerboar d)); 88 SkAutoTUnref<SkImageFilter> checkerboard(SkBitmapSource::Create(fChecker board));
89 89
90 SkImageFilter* filters[] = { 90 SkImageFilter* filters[] = {
91 new SkBlurImageFilter(SkIntToScalar(4), SkIntToScalar(4)), 91 SkBlurImageFilter::Create(SkIntToScalar(4), SkIntToScalar(4)),
92 new SkDropShadowImageFilter(SkIntToScalar(5), SkIntToScalar(10), SkI ntToScalar(3), 92 SkDropShadowImageFilter::Create(SkIntToScalar(5), SkIntToScalar(10), SkIntToScalar(3),
93 SK_ColorYELLOW), 93 SK_ColorYELLOW),
94 new SkDisplacementMapEffect(SkDisplacementMapEffect::kR_ChannelSelec torType, 94 SkDisplacementMapEffect::Create(SkDisplacementMapEffect::kR_ChannelS electorType,
95 SkDisplacementMapEffect::kR_ChannelSelec torType, 95 SkDisplacementMapEffect::kR_ChannelS electorType,
96 SkIntToScalar(12), 96 SkIntToScalar(12),
97 gradient.get(), 97 gradient.get(),
98 checkerboard.get()), 98 checkerboard.get()),
99 new SkDilateImageFilter(1, 1, checkerboard.get()), 99 SkDilateImageFilter::Create(1, 1, checkerboard.get()),
100 new SkErodeImageFilter(1, 1, checkerboard.get()), 100 SkErodeImageFilter::Create(1, 1, checkerboard.get()),
101 new SkOffsetImageFilter(SkIntToScalar(32), 0), 101 SkOffsetImageFilter::Create(SkIntToScalar(32), 0),
102 new SkResizeImageFilter(RESIZE_FACTOR, RESIZE_FACTOR, SkPaint::kNone _FilterLevel), 102 SkResizeImageFilter::Create(RESIZE_FACTOR, RESIZE_FACTOR, SkPaint::k None_FilterLevel),
103 }; 103 };
104 104
105 SkVector scales[] = { 105 SkVector scales[] = {
106 SkVector::Make(SkScalarInvert(2), SkScalarInvert(2)), 106 SkVector::Make(SkScalarInvert(2), SkScalarInvert(2)),
107 SkVector::Make(SkIntToScalar(1), SkIntToScalar(1)), 107 SkVector::Make(SkIntToScalar(1), SkIntToScalar(1)),
108 SkVector::Make(SkIntToScalar(1), SkIntToScalar(2)), 108 SkVector::Make(SkIntToScalar(1), SkIntToScalar(2)),
109 SkVector::Make(SkIntToScalar(2), SkIntToScalar(1)), 109 SkVector::Make(SkIntToScalar(2), SkIntToScalar(1)),
110 SkVector::Make(SkIntToScalar(2), SkIntToScalar(2)), 110 SkVector::Make(SkIntToScalar(2), SkIntToScalar(2)),
111 }; 111 };
112 112
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 SkBitmap fGradientCircle; 150 SkBitmap fGradientCircle;
151 typedef GM INHERITED; 151 typedef GM INHERITED;
152 }; 152 };
153 153
154 ////////////////////////////////////////////////////////////////////////////// 154 //////////////////////////////////////////////////////////////////////////////
155 155
156 static GM* MyFactory(void*) { return new ImageFiltersScaledGM; } 156 static GM* MyFactory(void*) { return new ImageFiltersScaledGM; }
157 static GMRegistry reg(MyFactory); 157 static GMRegistry reg(MyFactory);
158 158
159 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698