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

Side by Side Diff: samplecode/SampleLighting.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « samplecode/SampleLayers.cpp ('k') | samplecode/SampleLines.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 /* 2 /*
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SampleCode.h" 8 #include "SampleCode.h"
9 #include "Resources.h" 9 #include "Resources.h"
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 SkPaint paint; 82 SkPaint paint;
83 paint.setShader(fShader); 83 paint.setShader(fShader);
84 paint.setColor(SK_ColorBLACK); 84 paint.setColor(SK_ColorBLACK);
85 85
86 SkRect r = SkRect::MakeWH((SkScalar)fDiffuseBitmap.width(), 86 SkRect r = SkRect::MakeWH((SkScalar)fDiffuseBitmap.width(),
87 (SkScalar)fDiffuseBitmap.height()); 87 (SkScalar)fDiffuseBitmap.height());
88 canvas->drawRect(r, paint); 88 canvas->drawRect(r, paint);
89 89
90 // so we're constantly updating 90 // so we're constantly updating
91 this->inval(NULL); 91 this->inval(nullptr);
92 } 92 }
93 93
94 SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) ove rride { 94 SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) ove rride {
95 this->inval(NULL); 95 this->inval(nullptr);
96 return this->INHERITED::onFindClickHandler(x, y, modi); 96 return this->INHERITED::onFindClickHandler(x, y, modi);
97 } 97 }
98 98
99 private: 99 private:
100 typedef SampleView INHERITED; 100 typedef SampleView INHERITED;
101 }; 101 };
102 102
103 ////////////////////////////////////////////////////////////////////////////// 103 //////////////////////////////////////////////////////////////////////////////
104 104
105 static SkView* MyFactory() { return new LightingView; } 105 static SkView* MyFactory() { return new LightingView; }
106 static SkViewRegister reg(MyFactory); 106 static SkViewRegister reg(MyFactory);
OLDNEW
« no previous file with comments | « samplecode/SampleLayers.cpp ('k') | samplecode/SampleLines.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698