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

Side by Side Diff: src/core/SkPathRef.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 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/core/SkPath.cpp ('k') | src/core/SkPicture.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 2013 Google Inc. 2 * Copyright 2013 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 "SkBuffer.h" 8 #include "SkBuffer.h"
9 #include "SkLazyPtr.h" 9 #include "SkLazyPtr.h"
10 #include "SkPath.h" 10 #include "SkPath.h"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 336
337 fVerbCnt += numVbs; 337 fVerbCnt += numVbs;
338 fPointCnt += pCnt; 338 fPointCnt += pCnt;
339 fFreeSpace -= space; 339 fFreeSpace -= space;
340 fBoundsIsDirty = true; // this also invalidates fIsFinite 340 fBoundsIsDirty = true; // this also invalidates fIsFinite
341 if (dirtyAfterEdit) { 341 if (dirtyAfterEdit) {
342 fIsOval = false; 342 fIsOval = false;
343 } 343 }
344 344
345 if (SkPath::kConic_Verb == verb) { 345 if (SkPath::kConic_Verb == verb) {
346 SkASSERT(NULL != weights); 346 SkASSERT(weights);
347 *weights = fConicWeights.append(numVbs); 347 *weights = fConicWeights.append(numVbs);
348 } 348 }
349 349
350 SkDEBUGCODE(this->validate();) 350 SkDEBUGCODE(this->validate();)
351 return ret; 351 return ret;
352 } 352 }
353 353
354 SkPoint* SkPathRef::growForVerb(int /* SkPath::Verb*/ verb, SkScalar weight) { 354 SkPoint* SkPathRef::growForVerb(int /* SkPath::Verb*/ verb, SkScalar weight) {
355 SkDEBUGCODE(this->validate();) 355 SkDEBUGCODE(this->validate();)
356 int pCnt; 356 int pCnt;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 break; 479 break;
480 default: 480 default:
481 SkDEBUGFAIL("Unknown Verb"); 481 SkDEBUGFAIL("Unknown Verb");
482 break; 482 break;
483 } 483 }
484 } 484 }
485 SkASSERT(mask == fSegmentMask); 485 SkASSERT(mask == fSegmentMask);
486 #endif // SK_DEBUG_PATH 486 #endif // SK_DEBUG_PATH
487 } 487 }
488 #endif 488 #endif
OLDNEW
« no previous file with comments | « src/core/SkPath.cpp ('k') | src/core/SkPicture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698