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

Unified Diff: tools/filtermain.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 | « tools/PictureRenderer.cpp ('k') | tools/flags/SkCommandLineFlags.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/filtermain.cpp
diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp
index 00854d4e3efce54a5bb6037b2331cd1985f9b56f..87d68ff3a2e933222f103c53c8db2f1ce43b2519 100644
--- a/tools/filtermain.cpp
+++ b/tools/filtermain.cpp
@@ -84,7 +84,7 @@ static void apply_0(SkDebugCanvas* canvas, int curCommand) {
const SkPaint* saveLayerPaint = saveLayer->paint();
// if (NULL == saveLayerPaint) the dbmr's paint doesn't need to be changed
- if (NULL != saveLayerPaint) {
+ if (saveLayerPaint) {
SkDrawBitmapRectCommand* dbmr =
(SkDrawBitmapRectCommand*) canvas->getDrawCommandAt(curCommand+1);
SkPaint* dbmrPaint = dbmr->paint();
@@ -92,7 +92,7 @@ static void apply_0(SkDebugCanvas* canvas, int curCommand) {
if (NULL == dbmrPaint) {
// if the DBMR doesn't have a paint just use the saveLayer's
dbmr->setPaint(*saveLayerPaint);
- } else if (NULL != saveLayerPaint) {
+ } else if (saveLayerPaint) {
// Both paints are present so their alphas need to be combined
SkColor color = saveLayerPaint->getColor();
int a0 = SkColorGetA(color);
@@ -162,7 +162,7 @@ static void apply_1(SkDebugCanvas* canvas, int curCommand) {
const SkPaint* saveLayerPaint = saveLayer->paint();
// if (NULL == saveLayerPaint) the dbmr's paint doesn't need to be changed
- if (NULL != saveLayerPaint) {
+ if (saveLayerPaint) {
SkDrawBitmapRectCommand* dbmr =
(SkDrawBitmapRectCommand*) canvas->getDrawCommandAt(curCommand+3);
SkPaint* dbmrPaint = dbmr->paint();
@@ -423,8 +423,8 @@ static bool check_7(SkDebugCanvas* canvas, int curCommand) {
const SkPaint* saveLayerPaint0 = saveLayer0->paint();
const SkPaint* saveLayerPaint1 = saveLayer1->paint();
- if ((NULL != saveLayerPaint0 && !is_simple(*saveLayerPaint0)) ||
- (NULL != saveLayerPaint1 && !is_simple(*saveLayerPaint1))) {
+ if ((saveLayerPaint0 && !is_simple(*saveLayerPaint0)) ||
+ (saveLayerPaint1 && !is_simple(*saveLayerPaint1))) {
return false;
}
@@ -434,14 +434,14 @@ static bool check_7(SkDebugCanvas* canvas, int curCommand) {
return true;
}
- if (NULL != saveLayerPaint0) {
+ if (saveLayerPaint0) {
SkColor layerColor0 = saveLayerPaint0->getColor() | 0xFF000000; // force opaque
if (dbmrPaint->getColor() != layerColor0) {
return false;
}
}
- if (NULL != saveLayerPaint1) {
+ if (saveLayerPaint1) {
SkColor layerColor1 = saveLayerPaint1->getColor() | 0xFF000000; // force opaque
if (dbmrPaint->getColor() != layerColor1) {
return false;
@@ -477,7 +477,7 @@ static void apply_7(SkDebugCanvas* canvas, int curCommand) {
int a0, a1;
const SkPaint* saveLayerPaint0 = saveLayer0->paint();
- if (NULL != saveLayerPaint0) {
+ if (saveLayerPaint0) {
color = saveLayerPaint0->getColor();
a0 = SkColorGetA(color);
} else {
@@ -485,7 +485,7 @@ static void apply_7(SkDebugCanvas* canvas, int curCommand) {
}
const SkPaint* saveLayerPaint1 = saveLayer1->paint();
- if (NULL != saveLayerPaint1) {
+ if (saveLayerPaint1) {
color = saveLayerPaint1->getColor();
a1 = SkColorGetA(color);
} else {
@@ -497,7 +497,7 @@ static void apply_7(SkDebugCanvas* canvas, int curCommand) {
SkPaint* dbmrPaint = dbmr->paint();
- if (NULL != dbmrPaint) {
+ if (dbmrPaint) {
SkColor newColor = SkColorSetA(dbmrPaint->getColor(), newA);
dbmrPaint->setColor(newColor);
} else {
@@ -579,7 +579,7 @@ static void apply_8(SkDebugCanvas* canvas, int curCommand) {
SkScalar newSrcLeft, newSrcTop;
- if (NULL != dbmr->srcRect()) {
+ if (dbmr->srcRect()) {
newSrcLeft = dbmr->srcRect()->fLeft + clip->rect().fLeft - dbmr->dstRect().fLeft;
newSrcTop = dbmr->srcRect()->fTop + clip->rect().fTop - dbmr->dstRect().fTop;
} else {
« no previous file with comments | « tools/PictureRenderer.cpp ('k') | tools/flags/SkCommandLineFlags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698