commit d1119ee64f3a08be5977984bbb73bf85d61ffa53
author Tom Sepez <tsepez@chromium.org> Tue Oct 19 23:33:41 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 19 23:33:41 2021 +0000
tree 7c26fd948100c4697ae010b8341f08220d6e2c28
parent fea38c8ca8383d00b9cfa793624f76109724aee0

Pass span<> to GetNames() in cfgas_fontmgr.cpp

Close out a TODO() from 2018.

Change-Id: Ibcf00abe7192cb491b8d7ee6f6c4096970b60893
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/86177
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fgas/font/cfgas_fontmgr.cpp

diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index be4a8f9..ddfe438 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -24,6 +24,7 @@
 #include "third_party/base/check.h"
 #include "third_party/base/containers/contains.h"
 #include "third_party/base/cxx17_backports.h"
+#include "third_party/base/span.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
 
@@ -362,13 +363,12 @@
 
 }  // extern "C"
 
-// TODO(thestig): Pass in |name_table| as a std::vector?
-std::vector<WideString> GetNames(const uint8_t* name_table) {
+std::vector<WideString> GetNames(pdfium::span<const uint8_t> name_table) {
   std::vector<WideString> results;
-  if (!name_table)
+  if (name_table.empty())
     return results;
 
-  const uint8_t* pTable = name_table;
+  const uint8_t* pTable = name_table.data();
   WideString wsFamily;
   const uint8_t* sp = pTable + 2;
   const uint8_t* pNameRecord = pTable + 6;
@@ -718,7 +718,7 @@
     if (FT_Load_Sfnt_Table(pFace->GetRec(), dwTag, 0, table.data(), nullptr))
       table.clear();
   }
-  pFont->m_wsFamilyNames = GetNames(table.empty() ? nullptr : table.data());
+  pFont->m_wsFamilyNames = GetNames(table);
   pFont->m_wsFamilyNames.push_back(
       WideString::FromUTF8(pFace->GetRec()->family_name));
   pFont->m_wsFaceName =