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

Unified Diff: gm/dftext.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 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 | « gm/dcshader.cpp ('k') | gm/discard.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/dftext.cpp
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index f6bc0b2b9c9ce188c6130f5cdf56e036424dfa06..c66e03fdc894144adfa8b82a8df45f13d71e75ef 100644
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -81,7 +81,7 @@ protected:
canvas->scale(scales[i], scales[i]);
paint.setTextSize(textSizes[i]);
canvas->drawText(text, textLen, 0, 0, paint);
- y += paint.getFontMetrics(NULL)*scales[i];
+ y += paint.getFontMetrics(nullptr)*scales[i];
}
// check rotation
@@ -95,7 +95,7 @@ protected:
for (int ps = 6; ps <= 32; ps += 3) {
paint.setTextSize(SkIntToScalar(ps));
canvas->drawText(text, textLen, rotX, rotY, paint);
- rotY += paint.getFontMetrics(NULL);
+ rotY += paint.getFontMetrics(nullptr);
}
}
@@ -111,7 +111,7 @@ protected:
canvas->scale(scaleFactor, scaleFactor);
paint.setTextSize(textSizes[i]);
canvas->drawText(text, textLen, 0, 0, paint);
- y += paint.getFontMetrics(NULL)*scaleFactor;
+ y += paint.getFontMetrics(nullptr)*scaleFactor;
}
// check pos text
@@ -156,7 +156,7 @@ protected:
paint.setColor(fg[i]);
canvas->drawText(text, textLen, x, y, paint);
- y += paint.getFontMetrics(NULL);
+ y += paint.getFontMetrics(nullptr);
}
paint.setColor(0xFF181C18);
@@ -170,7 +170,7 @@ protected:
paint.setColor(fg[i]);
canvas->drawText(text, textLen, x, y, paint);
- y += paint.getFontMetrics(NULL);
+ y += paint.getFontMetrics(nullptr);
}
// check skew
@@ -202,7 +202,7 @@ protected:
// since we prepended this matrix already, we blit using identity
inputCanvas->resetMatrix();
SkImage* image = surface->newImageSnapshot();
- inputCanvas->drawImage(image, 0, 0, NULL);
+ inputCanvas->drawImage(image, 0, 0, nullptr);
image->unref();
}
#endif
« no previous file with comments | « gm/dcshader.cpp ('k') | gm/discard.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698