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

Side by Side Diff: samplecode/SampleAARectModes.cpp

Issue 1772463002: use Make instead of Create to return a shared shader (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: partial update of skia call-sites 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
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 "SampleCode.h" 8 #include "SampleCode.h"
9 #include "SkView.h" 9 #include "SkView.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 SkScalar offset = SK_Scalar1 / 3; 55 SkScalar offset = SK_Scalar1 / 3;
56 SkRect rect = SkRect::MakeXYWH(W / 4 + offset, 56 SkRect rect = SkRect::MakeXYWH(W / 4 + offset,
57 H / 4 + offset, 57 H / 4 + offset,
58 W / 2, H / 2); 58 W / 2, H / 2);
59 canvas->drawRect(rect, paint); 59 canvas->drawRect(rect, paint);
60 60
61 return H; 61 return H;
62 } 62 }
63 63
64 static SkShader* make_bg_shader() { 64 static sk_sp<SkShader> make_bg_shader() {
65 SkBitmap bm; 65 SkBitmap bm;
66 bm.allocN32Pixels(2, 2); 66 bm.allocN32Pixels(2, 2);
67 *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF; 67 *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF;
68 *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 68 *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC,
69 0xCC, 0xCC); 69 0xCC, 0xCC);
70 70
71 SkMatrix m; 71 SkMatrix m;
72 m.setScale(SkIntToScalar(6), SkIntToScalar(6)); 72 m.setScale(SkIntToScalar(6), SkIntToScalar(6));
73 73
74 return SkShader::CreateBitmapShader(bm, 74 return SkShader::MakeBitmapShader(bm,
75 SkShader::kRepeat_TileMode, 75 SkShader::kRepeat_TileMode,
76 SkShader::kRepeat_TileMode, 76 SkShader::kRepeat_TileMode,
77 &m); 77 &m);
78 } 78 }
79 79
80 class AARectsModesView : public SampleView { 80 class AARectsModesView : public SampleView {
81 SkPaint fBGPaint; 81 SkPaint fBGPaint;
82 public: 82 public:
83 AARectsModesView () { 83 AARectsModesView () {
84 fBGPaint.setShader(make_bg_shader())->unref(); 84 fBGPaint.setShader(make_bg_shader());
85 } 85 }
86 86
87 protected: 87 protected:
88 // overrides from SkEventSink 88 // overrides from SkEventSink
89 virtual bool onQuery(SkEvent* evt) { 89 virtual bool onQuery(SkEvent* evt) {
90 if (SampleCode::TitleQ(*evt)) { 90 if (SampleCode::TitleQ(*evt)) {
91 SampleCode::TitleR(evt, "AARectsModes"); 91 SampleCode::TitleR(evt, "AARectsModes");
92 return true; 92 return true;
93 } 93 }
94 return this->INHERITED::onQuery(evt); 94 return this->INHERITED::onQuery(evt);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } 128 }
129 129
130 private: 130 private:
131 typedef SampleView INHERITED; 131 typedef SampleView INHERITED;
132 }; 132 };
133 133
134 /////////////////////////////////////////////////////////////////////////////// 134 ///////////////////////////////////////////////////////////////////////////////
135 135
136 static SkView* MyFactory() { return new AARectsModesView; } 136 static SkView* MyFactory() { return new AARectsModesView; }
137 static SkViewRegister reg(MyFactory); 137 static SkViewRegister reg(MyFactory);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698