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

Side by Side Diff: src/animator/SkDrawClip.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 | « src/animator/SkDrawBlur.cpp ('k') | src/animator/SkDrawColor.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 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
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 8
9 9
10 #include "SkDrawClip.h" 10 #include "SkDrawClip.h"
11 #include "SkAnimateMaker.h" 11 #include "SkAnimateMaker.h"
12 #include "SkCanvas.h" 12 #include "SkCanvas.h"
13 #include "SkDrawRectangle.h" 13 #include "SkDrawRectangle.h"
14 #include "SkDrawPath.h" 14 #include "SkDrawPath.h"
15 15
16 16
17 #if SK_USE_CONDENSED_INFO == 0 17 #if SK_USE_CONDENSED_INFO == 0
18 18
19 const SkMemberInfo SkDrawClip::fInfo[] = { 19 const SkMemberInfo SkDrawClip::fInfo[] = {
20 SK_MEMBER(path, Path), 20 SK_MEMBER(path, Path),
21 SK_MEMBER(rect, Rect) 21 SK_MEMBER(rect, Rect)
22 }; 22 };
23 23
24 #endif 24 #endif
25 25
26 DEFINE_GET_MEMBER(SkDrawClip); 26 DEFINE_GET_MEMBER(SkDrawClip);
27 27
28 SkDrawClip::SkDrawClip() : rect(NULL), path(NULL) { 28 SkDrawClip::SkDrawClip() : rect(nullptr), path(nullptr) {
29 } 29 }
30 30
31 bool SkDrawClip::draw(SkAnimateMaker& maker ) { 31 bool SkDrawClip::draw(SkAnimateMaker& maker ) {
32 if (rect != NULL) 32 if (rect != nullptr)
33 maker.fCanvas->clipRect(rect->fRect); 33 maker.fCanvas->clipRect(rect->fRect);
34 else { 34 else {
35 SkASSERT(path != NULL); 35 SkASSERT(path != nullptr);
36 maker.fCanvas->clipPath(path->fPath); 36 maker.fCanvas->clipPath(path->fPath);
37 } 37 }
38 return false; 38 return false;
39 } 39 }
OLDNEW
« no previous file with comments | « src/animator/SkDrawBlur.cpp ('k') | src/animator/SkDrawColor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698