Cleanup CFX_Font a bit.

core/src/fpdfapi/fpdf_font/ttgsubtable.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "ttgsubtable.h"
@@ skipping 377 matching lines @@
 }
 FX_BOOL CFX_GSUBTable::GetVerticalGlyph(FX_DWORD glyphnum,
                                         FX_DWORD* vglyphnum) {
   return m_GsubImp.GetVerticalGlyph(glyphnum, vglyphnum);
 }
 // static
 IFX_GSUBTable* IFX_GSUBTable::Create(CFX_Font* pFont) {
   if (!pFont) {
     return NULL;
   }
-  if (NULL == pFont->m_pGsubData) {
+  if (!pFont->GetSubData()) {
     unsigned long length = 0;
     int error = FXFT_Load_Sfnt_Table(
-        pFont->m_Face, FT_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, &length);
+        pFont->GetFace(), FT_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, &length);
     if (!error) {
-      pFont->m_pGsubData = (unsigned char*)FX_Alloc(uint8_t, length);
+      pFont->SetSubData((uint8_t*)FX_Alloc(uint8_t, length));
     }
-    if (!pFont->m_pGsubData) {
+    if (!pFont->GetSubData()) {
       return NULL;
     }
   }
   int error =
-      FXFT_Load_Sfnt_Table(pFont->m_Face, FT_MAKE_TAG('G', 'S', 'U', 'B'), 0,
-                           pFont->m_pGsubData, NULL);
-  if (!error && pFont->m_pGsubData) {
+      FXFT_Load_Sfnt_Table(pFont->GetFace(), FT_MAKE_TAG('G', 'S', 'U', 'B'), 0,
+                           pFont->GetSubData(), NULL);
+  if (!error && pFont->GetSubData()) {
     nonstd::unique_ptr<CFX_GSUBTable> pGsubTable(new CFX_GSUBTable);
-    if (pGsubTable->m_GsubImp.LoadGSUBTable((FT_Bytes)pFont->m_pGsubData)) {
+    if (pGsubTable->m_GsubImp.LoadGSUBTable((FT_Bytes)pFont->GetSubData())) {
       return pGsubTable.release();
     }
   }
   return NULL;
 }