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

Side by Side Diff: src/svg/parser/SkSVGGradient.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/svg/parser/SkSVGElements.cpp ('k') | src/svg/parser/SkSVGGroup.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 "SkSVGGradient.h" 10 #include "SkSVGGradient.h"
(...skipping 15 matching lines...) Expand all
26 return false; 26 return false;
27 } 27 }
28 28
29 void SkSVGGradient::translate(SkSVGParser& parser, bool defState) { 29 void SkSVGGradient::translate(SkSVGParser& parser, bool defState) {
30 INHERITED::translate(parser, defState); 30 INHERITED::translate(parser, defState);
31 // !!! no support for 'objectBoundingBox' yet 31 // !!! no support for 'objectBoundingBox' yet
32 bool first = true; 32 bool first = true;
33 bool addedFirst = false; 33 bool addedFirst = false;
34 bool addedLast = false; 34 bool addedLast = false;
35 SkString offsets("["); 35 SkString offsets("[");
36 SkString* lastOffset = NULL; 36 SkString* lastOffset = nullptr;
37 for (SkSVGElement** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) { 37 for (SkSVGElement** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
38 SkASSERT((*ptr)->getType() == SkSVGType_Stop); 38 SkASSERT((*ptr)->getType() == SkSVGType_Stop);
39 SkSVGStop* stop = (SkSVGStop*) *ptr; 39 SkSVGStop* stop = (SkSVGStop*) *ptr;
40 if (first && stop->f_offset.equals("0") == false) { 40 if (first && stop->f_offset.equals("0") == false) {
41 addedFirst = true; 41 addedFirst = true;
42 offsets.append("0,"); 42 offsets.append("0,");
43 } 43 }
44 SkString* thisOffset = &stop->f_offset; 44 SkString* thisOffset = &stop->f_offset;
45 if (lastOffset && thisOffset->equals(*lastOffset)) { 45 if (lastOffset && thisOffset->equals(*lastOffset)) {
46 if (thisOffset->equals("1")) { 46 if (thisOffset->equals("1")) {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 for (SkSVGElement** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) { 105 for (SkSVGElement** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
106 SkSVGStop* color = (SkSVGStop*) *ptr; 106 SkSVGStop* color = (SkSVGStop*) *ptr;
107 const char* originalEnd = strchr(originalPtr, ','); 107 const char* originalEnd = strchr(originalPtr, ',');
108 color->fPaintState.f_stopColor.set(originalPtr, originalEnd - originalPt r); 108 color->fPaintState.f_stopColor.set(originalPtr, originalEnd - originalPt r);
109 originalPtr = originalEnd + 1; 109 originalPtr = originalEnd + 1;
110 } 110 }
111 f_id.set(originalID); 111 f_id.set(originalID);
112 parser.fSuppressPaint = false; 112 parser.fSuppressPaint = false;
113 parser.fHead = saveHead; 113 parser.fHead = saveHead;
114 } 114 }
OLDNEW
« no previous file with comments | « src/svg/parser/SkSVGElements.cpp ('k') | src/svg/parser/SkSVGGroup.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698