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

Unified Diff: src/gpu/GrRecordReplaceDraw.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/gpu/GrRODrawState.cpp ('k') | src/gpu/GrRedBlackTree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrRecordReplaceDraw.cpp
diff --git a/src/gpu/GrRecordReplaceDraw.cpp b/src/gpu/GrRecordReplaceDraw.cpp
index ab5192680de4a66bfa8413145bfea6afb93cf095..f0abd6481e70535e86d31c0ce18214f3f694b4c1 100644
--- a/src/gpu/GrRecordReplaceDraw.cpp
+++ b/src/gpu/GrRecordReplaceDraw.cpp
@@ -71,7 +71,7 @@ void GrRecordReplaceDraw(const SkRecord& record,
const GrReplacements::ReplacementInfo* ri = NULL;
int searchStart = 0;
- if (NULL != bbh) {
+ if (bbh) {
// Draw only ops that affect pixels in the canvas's current clip.
// The SkRecord and BBH were recorded in identity space. This canvas
// is not necessarily in that same space. getClipBounds() returns us
@@ -84,11 +84,11 @@ void GrRecordReplaceDraw(const SkRecord& record,
bbh->search(query, &ops);
for (int i = 0; i < ops.count(); i++) {
- if (NULL != callback && callback->abortDrawing()) {
+ if (callback && callback->abortDrawing()) {
return;
}
ri = replacements->lookupByStart((uintptr_t)ops[i], &searchStart);
- if (NULL != ri) {
+ if (ri) {
draw_replacement_bitmap(ri, canvas);
while ((uintptr_t)ops[i] < ri->fStop) {
@@ -102,11 +102,11 @@ void GrRecordReplaceDraw(const SkRecord& record,
}
} else {
for (unsigned int i = 0; i < record.count(); ++i) {
- if (NULL != callback && callback->abortDrawing()) {
+ if (callback && callback->abortDrawing()) {
return;
}
ri = replacements->lookupByStart(i, &searchStart);
- if (NULL != ri) {
+ if (ri) {
draw_replacement_bitmap(ri, canvas);
i = ri->fStop;
« no previous file with comments | « src/gpu/GrRODrawState.cpp ('k') | src/gpu/GrRedBlackTree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698