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

Unified Diff: src/core/SkTextBlob.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkTMultiMap.h ('k') | src/core/SkUtils.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkTextBlob.cpp
diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
index d928d7bc258b4df3c0ebd163e5358b5b1d35fa2e..ee110c7d07b9737bf992b8a72ec5124da767a34e 100644
--- a/src/core/SkTextBlob.cpp
+++ b/src/core/SkTextBlob.cpp
@@ -112,7 +112,7 @@ const SkTextBlob* SkTextBlob::CreateFromBuffer(SkReadBuffer& reader) {
SkTextBlob::RunIterator::RunIterator(const SkTextBlob* blob)
: fBlob(blob)
, fIndex(0) {
- SkASSERT(NULL != blob);
+ SkASSERT(blob);
}
bool SkTextBlob::RunIterator::done() const {
@@ -194,7 +194,7 @@ SkTextBlobBuilder::~SkTextBlobBuilder() {
}
void SkTextBlobBuilder::updateDeferredBounds() {
- SkASSERT(!fDeferredBounds || (NULL != fRuns && !fRuns->empty()));
+ SkASSERT(!fDeferredBounds || (fRuns && !fRuns->empty()));
if (!fDeferredBounds) {
return;
@@ -249,7 +249,7 @@ void SkTextBlobBuilder::allocInternal(const SkPaint &font,
fGlyphBuffer.append(count);
fPosBuffer.append(count * posScalarsPerGlyph);
- SkASSERT(NULL != fRuns && !fRuns->empty());
+ SkASSERT(fRuns && !fRuns->empty());
SkTextBlob::Run& run = fRuns->back();
run.count += count;
@@ -264,7 +264,7 @@ void SkTextBlobBuilder::allocInternal(const SkPaint &font,
SkASSERT(NULL == fCurrentRunBuffer.pos || fCurrentRunBuffer.pos >= fPosBuffer.begin());
if (!fDeferredBounds) {
- if (NULL != bounds) {
+ if (bounds) {
fBounds.join(*bounds);
} else {
fDeferredBounds = true;
@@ -301,7 +301,7 @@ const SkTextBlob* SkTextBlobBuilder::build() {
if (fGlyphBuffer.count() > 0) {
// we have some glyphs, construct a real blob
- SkASSERT(NULL != fRuns && !fRuns->empty());
+ SkASSERT(fRuns && !fRuns->empty());
this->updateDeferredBounds();
« no previous file with comments | « src/core/SkTMultiMap.h ('k') | src/core/SkUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698