| 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
|
|
|