Replace nil -> NULL in the views code.
Review URL: http://codereview.appspot.com/67139
git-svn-id: http://skia.googlecode.com/svn/trunk@200 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/SkParsePaint.cpp b/src/views/SkParsePaint.cpp
index 7bf0244..a79f30c 100644
--- a/src/views/SkParsePaint.cpp
+++ b/src/views/SkParsePaint.cpp
@@ -6,8 +6,8 @@
static SkShader* inflate_shader(const SkDOM& dom, const SkDOM::Node* node)
{
- if ((node = dom.getFirstChild(node, "shader")) == nil)
- return nil;
+ if ((node = dom.getFirstChild(node, "shader")) == NULL)
+ return NULL;
const char* str;
@@ -17,9 +17,9 @@
SkPoint pts[2];
colors[0] = colors[1] = SK_ColorBLACK; // need to initialized the alpha to opaque, since FindColor doesn't set it
- if ((str = dom.findAttr(node, "c0")) != nil &&
+ if ((str = dom.findAttr(node, "c0")) != NULL &&
SkParse::FindColor(str, &colors[0]) &&
- (str = dom.findAttr(node, "c1")) != nil &&
+ (str = dom.findAttr(node, "c1")) != NULL &&
SkParse::FindColor(str, &colors[1]) &&
dom.findScalars(node, "p0", &pts[0].fX, 2) &&
dom.findScalars(node, "p1", &pts[1].fX, 2))
@@ -29,13 +29,13 @@
if ((index = dom.findList(node, "tile-mode", "clamp,repeat,mirror")) >= 0)
mode = (SkShader::TileMode)index;
- return SkGradientShader::CreateLinear(pts, colors, nil, 2, mode);
+ return SkGradientShader::CreateLinear(pts, colors, NULL, 2, mode);
}
}
else if (dom.hasAttr(node, "type", "bitmap"))
{
- if ((str = dom.findAttr(node, "src")) == nil)
- return nil;
+ if ((str = dom.findAttr(node, "src")) == NULL)
+ return NULL;
SkBitmap bm;
@@ -50,7 +50,7 @@
return SkShader::CreateBitmapShader(bm, mode, mode);
}
}
- return nil;
+ return NULL;
}
void SkPaint_Inflate(SkPaint* paint, const SkDOM& dom, const SkDOM::Node* node)