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

Unified Diff: src/ports/SkScalerContext_win_dw.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 | « src/ports/SkRemotableFontMgr_win_dw.cpp ('k') | src/ports/SkTLS_none.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkScalerContext_win_dw.cpp
diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp
index 7bfa1d420d7a4debcb001f8dd2f1e7ae4f181854..e259479fcb7d320487eb36d70a5559203b705098 100644
--- a/src/ports/SkScalerContext_win_dw.cpp
+++ b/src/ports/SkScalerContext_win_dw.cpp
@@ -467,7 +467,7 @@ void SkScalerContext_DW::generateMetrics(SkGlyph* glyph) {
}
void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* metrics) {
- if (NULL == metrics) {
+ if (nullptr == metrics) {
return;
}
@@ -734,8 +734,8 @@ void SkScalerContext_DW::generatePath(const SkGlyph& glyph, SkPath* path) {
//It may not be needed, it appears that DirectWrite only hints at em size.
HRVM(fTypeface->fDWriteFontFace->GetGlyphRunOutline(SkScalarToFloat(fTextSizeRender),
&glyphId,
- NULL, //advances
- NULL, //offsets
+ nullptr, //advances
+ nullptr, //offsets
1, //num glyphs
FALSE, //sideways
FALSE, //rtl
« no previous file with comments | « src/ports/SkRemotableFontMgr_win_dw.cpp ('k') | src/ports/SkTLS_none.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698