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

Side by Side Diff: src/animator/SkBoundable.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/SkAnimatorScript2.cpp ('k') | src/animator/SkBuildCondensedInfo.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 "SkBoundable.h" 10 #include "SkBoundable.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 SkAnimateMaker& maker) : fBoundable(boundable), fMaker(maker) { 43 SkAnimateMaker& maker) : fBoundable(boundable), fMaker(maker) {
44 if (fBoundable->hasBounds()) { 44 if (fBoundable->hasBounds()) {
45 // fMaker.fCanvas->setBounder(&maker.fDisplayList); 45 // fMaker.fCanvas->setBounder(&maker.fDisplayList);
46 fMaker.fDisplayList.fBounds.setEmpty(); 46 fMaker.fDisplayList.fBounds.setEmpty();
47 } 47 }
48 } 48 }
49 49
50 SkBoundableAuto::~SkBoundableAuto() { 50 SkBoundableAuto::~SkBoundableAuto() {
51 if (fBoundable->hasBounds() == false) 51 if (fBoundable->hasBounds() == false)
52 return; 52 return;
53 // fMaker.fCanvas->setBounder(NULL); 53 // fMaker.fCanvas->setBounder(nullptr);
54 fBoundable->setBounds(fMaker.fDisplayList.fBounds); 54 fBoundable->setBounds(fMaker.fDisplayList.fBounds);
55 } 55 }
OLDNEW
« no previous file with comments | « src/animator/SkAnimatorScript2.cpp ('k') | src/animator/SkBuildCondensedInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698