| Index: core/fxge/android/fpf_skiafontmgr.h
|
| diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h
|
| index be3ea460da9c07e83187040d18c0041795c1e909..ec27a7fb2130aef289c5dd3d3bed7358e15b70d1 100644
|
| --- a/core/fxge/android/fpf_skiafontmgr.h
|
| +++ b/core/fxge/android/fpf_skiafontmgr.h
|
| @@ -28,7 +28,7 @@ class CFPF_SkiaFont;
|
| class CFPF_SkiaFontDescriptor {
|
| public:
|
| CFPF_SkiaFontDescriptor()
|
| - : m_pFamily(NULL),
|
| + : m_pFamily(nullptr),
|
| m_dwStyle(0),
|
| m_iFaceIndex(0),
|
| m_dwCharsets(0),
|
| @@ -53,7 +53,7 @@ class CFPF_SkiaFontDescriptor {
|
|
|
| class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor {
|
| public:
|
| - CFPF_SkiaPathFont() : m_pPath(NULL) {}
|
| + CFPF_SkiaPathFont() : m_pPath(nullptr) {}
|
| ~CFPF_SkiaPathFont() override { FX_Free(m_pPath); }
|
|
|
| // CFPF_SkiaFontDescriptor
|
| @@ -71,7 +71,7 @@ class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor {
|
|
|
| class CFPF_SkiaFileFont : public CFPF_SkiaFontDescriptor {
|
| public:
|
| - CFPF_SkiaFileFont() : m_pFile(NULL) {}
|
| + CFPF_SkiaFileFont() : m_pFile(nullptr) {}
|
|
|
| // CFPF_SkiaFontDescriptor
|
| int32_t GetType() const override { return FPF_SKIAFONTTYPE_File; }
|
| @@ -80,7 +80,7 @@ class CFPF_SkiaFileFont : public CFPF_SkiaFontDescriptor {
|
|
|
| class CFPF_SkiaBufferFont : public CFPF_SkiaFontDescriptor {
|
| public:
|
| - CFPF_SkiaBufferFont() : m_pBuffer(NULL), m_szBuffer(0) {}
|
| + CFPF_SkiaBufferFont() : m_pBuffer(nullptr), m_szBuffer(0) {}
|
|
|
| // CFPF_SkiaFontDescriptor
|
| int32_t GetType() const override { return FPF_SKIAFONTTYPE_Buffer; }
|
|
|