Index: src/ports/SkTypeface_win_dw.cpp |
diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp |
index 3af4cca4b248a147dec07c634e4e0a6f93445891..144d4c7367bdaa77586478367e1730fef59ef9bf 100644 |
--- a/src/ports/SkTypeface_win_dw.cpp |
+++ b/src/ports/SkTypeface_win_dw.cpp |
@@ -30,7 +30,7 @@ void DWriteFontTypeface::onGetFamilyName(SkString* familyName) const { |
SkTScopedComPtr<IDWriteLocalizedStrings> familyNames; |
HRV(fDWriteFontFamily->GetFamilyNames(&familyNames)); |
- sk_get_locale_string(familyNames.get(), NULL/*fMgr->fLocaleName.get()*/, familyName); |
+ sk_get_locale_string(familyNames.get(), nullptr/*fMgr->fLocaleName.get()*/, familyName); |
} |
void DWriteFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc, |
@@ -40,7 +40,7 @@ void DWriteFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc, |
HRV(fDWriteFontFamily->GetFamilyNames(&familyNames)); |
SkString utf8FamilyName; |
- sk_get_locale_string(familyNames.get(), NULL/*fMgr->fLocaleName.get()*/, &utf8FamilyName); |
+ sk_get_locale_string(familyNames.get(), nullptr/*fMgr->fLocaleName.get()*/, &utf8FamilyName); |
desc->setFamilyName(utf8FamilyName.c_str()); |
*isLocalStream = SkToBool(fDWriteFontFileLoader.get()); |
@@ -74,7 +74,7 @@ static EncodingProc find_encoding_proc(SkTypeface::Encoding enc) { |
int DWriteFontTypeface::onCharsToGlyphs(const void* chars, Encoding encoding, |
uint16_t glyphs[], int glyphCount) const |
{ |
- if (NULL == glyphs) { |
+ if (nullptr == glyphs) { |
EncodingProc next_ucs4_proc = find_encoding_proc(encoding); |
for (int i = 0; i < glyphCount; ++i) { |
const SkUnichar c = next_ucs4_proc(&chars); |
@@ -172,7 +172,7 @@ private: |
SkTypeface::LocalizedStrings* DWriteFontTypeface::onCreateFamilyNameIterator() const { |
SkTypeface::LocalizedStrings* nameIter = |
SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this); |
- if (NULL == nameIter) { |
+ if (nullptr == nameIter) { |
SkTScopedComPtr<IDWriteLocalizedStrings> familyNames; |
HRNM(fDWriteFontFamily->GetFamilyNames(&familyNames), "Could not obtain family names."); |
nameIter = new LocalizedStrings_IDWriteLocalizedStrings(familyNames.release()); |
@@ -217,10 +217,10 @@ SkStreamAsset* DWriteFontTypeface::onOpenStream(int* ttcIndex) const { |
*ttcIndex = fDWriteFontFace->GetIndex(); |
UINT32 numFiles; |
- HRNM(fDWriteFontFace->GetFiles(&numFiles, NULL), |
+ HRNM(fDWriteFontFace->GetFiles(&numFiles, nullptr), |
"Could not get number of font files."); |
if (numFiles != 1) { |
- return NULL; |
+ return nullptr; |
} |
SkTScopedComPtr<IDWriteFontFile> fontFile; |
@@ -265,7 +265,7 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const { |
#if SK_FONT_HOST_USE_SYSTEM_SETTINGS |
IDWriteFactory* factory = get_dwrite_factory(); |
- if (factory != NULL) { |
+ if (factory != nullptr) { |
SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams; |
if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) { |
float gamma = defaultRenderingParams->GetGamma(); |
@@ -332,7 +332,7 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics( |
const uint32_t* glyphIDs, |
uint32_t glyphIDsCount) const { |
- SkAdvancedTypefaceMetrics* info = NULL; |
+ SkAdvancedTypefaceMetrics* info = nullptr; |
HRESULT hr = S_OK; |