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

Side by Side Diff: samplecode/SampleHairModes.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 for (int angle = 0; angle < 24; ++angle) { 53 for (int angle = 0; angle < 24; ++angle) {
54 SkScalar x = SkScalarCos(SkIntToScalar(angle) * (SK_ScalarPI * 2) / 24) * gWidth; 54 SkScalar x = SkScalarCos(SkIntToScalar(angle) * (SK_ScalarPI * 2) / 24) * gWidth;
55 SkScalar y = SkScalarSin(SkIntToScalar(angle) * (SK_ScalarPI * 2) / 24) * gHeight; 55 SkScalar y = SkScalarSin(SkIntToScalar(angle) * (SK_ScalarPI * 2) / 24) * gHeight;
56 paint.setStrokeWidth(SK_Scalar1 * angle * 2 / 24); 56 paint.setStrokeWidth(SK_Scalar1 * angle * 2 / 24);
57 canvas->drawLine(W/2, H/2, W/2 + x, H/2 + y, paint); 57 canvas->drawLine(W/2, H/2, W/2 + x, H/2 + y, paint);
58 } 58 }
59 59
60 return H; 60 return H;
61 } 61 }
62 62
63 static SkShader* make_bg_shader() { 63 static sk_sp<SkShader> make_bg_shader() {
64 SkBitmap bm; 64 SkBitmap bm;
65 bm.allocN32Pixels(2, 2); 65 bm.allocN32Pixels(2, 2);
66 *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF; 66 *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF;
67 *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 0xCC, 0 xCC); 67 *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 0xCC, 0 xCC);
68 68
69 SkMatrix m; 69 SkMatrix m;
70 m.setScale(SkIntToScalar(6), SkIntToScalar(6)); 70 m.setScale(SkIntToScalar(6), SkIntToScalar(6));
71 71
72 return SkShader::CreateBitmapShader(bm, 72 return SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode,
73 SkShader::kRepeat_TileMode, 73 SkShader::kRepeat_TileMode, &m);
74 SkShader::kRepeat_TileMode,
75 &m);
76 } 74 }
77 75
78 class HairModesView : public SampleView { 76 class HairModesView : public SampleView {
79 SkPaint fBGPaint; 77 SkPaint fBGPaint;
80 public: 78 public:
81 HairModesView() { 79 HairModesView() {
82 fBGPaint.setShader(make_bg_shader())->unref(); 80 fBGPaint.setShader(make_bg_shader());
83 } 81 }
84 82
85 protected: 83 protected:
86 // overrides from SkEventSink 84 // overrides from SkEventSink
87 virtual bool onQuery(SkEvent* evt) { 85 virtual bool onQuery(SkEvent* evt) {
88 if (SampleCode::TitleQ(*evt)) { 86 if (SampleCode::TitleQ(*evt)) {
89 SampleCode::TitleR(evt, "HairlineModes"); 87 SampleCode::TitleR(evt, "HairlineModes");
90 return true; 88 return true;
91 } 89 }
92 return this->INHERITED::onQuery(evt); 90 return this->INHERITED::onQuery(evt);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 124 }
127 125
128 private: 126 private:
129 typedef SampleView INHERITED; 127 typedef SampleView INHERITED;
130 }; 128 };
131 129
132 /////////////////////////////////////////////////////////////////////////////// 130 ///////////////////////////////////////////////////////////////////////////////
133 131
134 static SkView* MyFactory() { return new HairModesView; } 132 static SkView* MyFactory() { return new HairModesView; }
135 static SkViewRegister reg(MyFactory); 133 static SkViewRegister reg(MyFactory);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698