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

Side by Side Diff: src/svg/parser/SkSVGPath.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/SkSVGParser.cpp ('k') | src/utils/SkBase64.h » ('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 "SkSVGPath.h" 10 #include "SkSVGPath.h"
11 #include "SkSVGParser.h" 11 #include "SkSVGParser.h"
12 12
13 const SkSVGAttribute SkSVGPath::gAttributes[] = { 13 const SkSVGAttribute SkSVGPath::gAttributes[] = {
14 SVG_ATTRIBUTE(d) 14 SVG_ATTRIBUTE(d)
15 }; 15 };
16 16
17 DEFINE_SVG_INFO(Path) 17 DEFINE_SVG_INFO(Path)
18 18
19 void SkSVGPath::translate(SkSVGParser& parser, bool defState) { 19 void SkSVGPath::translate(SkSVGParser& parser, bool defState) {
20 parser._startElement("path"); 20 parser._startElement("path");
21 INHERITED::translate(parser, defState); 21 INHERITED::translate(parser, defState);
22 bool hasMultiplePaths = false; 22 bool hasMultiplePaths = false;
23 const char* firstZ = strchr(f_d.c_str(), 'z'); 23 const char* firstZ = strchr(f_d.c_str(), 'z');
24 if (firstZ != NULL) { 24 if (firstZ != nullptr) {
25 firstZ++; // skip over 'z' 25 firstZ++; // skip over 'z'
26 while (*firstZ == ' ') 26 while (*firstZ == ' ')
27 firstZ++; 27 firstZ++;
28 hasMultiplePaths = *firstZ != '\0'; 28 hasMultiplePaths = *firstZ != '\0';
29 } 29 }
30 if (hasMultiplePaths) { 30 if (hasMultiplePaths) {
31 SkString& fillRule = parser.getPaintLast(SkSVGPaint::kFillRule); 31 SkString& fillRule = parser.getPaintLast(SkSVGPaint::kFillRule);
32 if (fillRule.size() > 0) 32 if (fillRule.size() > 0)
33 parser._addAttribute("fillType", fillRule.equals("evenodd") ? "evenO dd" : "winding"); 33 parser._addAttribute("fillType", fillRule.equals("evenodd") ? "evenO dd" : "winding");
34 } 34 }
35 SVG_ADD_ATTRIBUTE(d); 35 SVG_ADD_ATTRIBUTE(d);
36 parser._endElement(); 36 parser._endElement();
37 } 37 }
OLDNEW
« no previous file with comments | « src/svg/parser/SkSVGParser.cpp ('k') | src/utils/SkBase64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698