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

Side by Side Diff: src/gpu/GrStrokeInfo.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/gpu/GrStencilAndCoverTextContext.cpp ('k') | src/gpu/GrSurface.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 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrStrokeInfo.h" 8 #include "GrStrokeInfo.h"
9 #include "GrResourceKey.h" 9 #include "GrResourceKey.h"
10 #include "SkDashPathPriv.h" 10 #include "SkDashPathPriv.h"
11 11
12 bool GrStrokeInfo::applyDashToPath(SkPath* dst, GrStrokeInfo* dstStrokeInfo, 12 bool GrStrokeInfo::applyDashToPath(SkPath* dst, GrStrokeInfo* dstStrokeInfo,
13 const SkPath& src) const { 13 const SkPath& src) const {
14 if (this->isDashed()) { 14 if (this->isDashed()) {
15 SkPathEffect::DashInfo info; 15 SkPathEffect::DashInfo info;
16 info.fIntervals = fIntervals.get(); 16 info.fIntervals = fIntervals.get();
17 info.fCount = fIntervals.count(); 17 info.fCount = fIntervals.count();
18 info.fPhase = fDashPhase; 18 info.fPhase = fDashPhase;
19 GrStrokeInfo filteredStroke(*this, false); 19 GrStrokeInfo filteredStroke(*this, false);
20 if (SkDashPath::FilterDashPath(dst, src, &filteredStroke, NULL, info)) { 20 if (SkDashPath::FilterDashPath(dst, src, &filteredStroke, nullptr, info) ) {
21 *dstStrokeInfo = filteredStroke; 21 *dstStrokeInfo = filteredStroke;
22 return true; 22 return true;
23 } 23 }
24 } 24 }
25 return false; 25 return false;
26 } 26 }
27 27
28 void GrStrokeInfo::asUniqueKeyFragment(uint32_t* data) const { 28 void GrStrokeInfo::asUniqueKeyFragment(uint32_t* data) const {
29 const int kSkScalarData32Cnt = sizeof(SkScalar) / sizeof(uint32_t); 29 const int kSkScalarData32Cnt = sizeof(SkScalar) / sizeof(uint32_t);
30 enum { 30 enum {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 const SkScalar* intervals = this->getDashIntervals(); 69 const SkScalar* intervals = this->getDashIntervals();
70 int intervalByteCnt = count * sizeof(SkScalar); 70 int intervalByteCnt = count * sizeof(SkScalar);
71 memcpy(&data[i], intervals, intervalByteCnt); 71 memcpy(&data[i], intervals, intervalByteCnt);
72 // Enable the line below if fields are added after dashing. 72 // Enable the line below if fields are added after dashing.
73 SkDEBUGCODE(i += kSkScalarData32Cnt * count); 73 SkDEBUGCODE(i += kSkScalarData32Cnt * count);
74 } 74 }
75 75
76 SkASSERT(this->computeUniqueKeyFragmentData32Cnt() == i); 76 SkASSERT(this->computeUniqueKeyFragmentData32Cnt() == i);
77 } 77 }
78 78
OLDNEW
« no previous file with comments | « src/gpu/GrStencilAndCoverTextContext.cpp ('k') | src/gpu/GrSurface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698