commit 3a4fd4cd617a8766ca20b223b1e4dad697c4e8f7
author Tom Sepez <tsepez@chromium.org> Fri Aug 21 23:07:12 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Aug 21 23:07:12 2020 +0000
tree 0241bd836c06e1bbab48669e168b8f8293cf9d57
parent f931d80d4302dd7bf02b94de43d15c9851beb854

Remove virtual method SystemFontInfoIface::GetFaceIndex().

It is never overridden, and the default impl just returns 0.

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

core/fxge/cfx_fontmapper.cpp

diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index feca121..2ac33dd 100644
--- a/core/fxge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
@@ -771,8 +771,7 @@
     return pFace;
 
   pFace = m_pFontMgr->NewFixedFace(pFontDesc,
-                                   pFontDesc->FontData().first(font_size),
-                                   m_pFontInfo->GetFaceIndex(hFont));
+                                   pFontDesc->FontData().first(font_size), 0);
   if (!pFace)
     return nullptr;
 

core/fxge/fx_ge_fontmap.cpp

diff --git a/core/fxge/fx_ge_fontmap.cpp b/core/fxge/fx_ge_fontmap.cpp
index c99d08d..3c993a3 100644
--- a/core/fxge/fx_ge_fontmap.cpp
+++ b/core/fxge/fx_ge_fontmap.cpp
@@ -9,10 +9,6 @@
 #include "build/build_config.h"
 #include "core/fxge/systemfontinfo_iface.h"
 
-int SystemFontInfoIface::GetFaceIndex(void* hFont) {
-  return 0;
-}
-
 #if defined(OS_ANDROID)
 std::unique_ptr<SystemFontInfoIface> SystemFontInfoIface::CreateDefault(
     const char** pUnused) {

core/fxge/systemfontinfo_iface.h

diff --git a/core/fxge/systemfontinfo_iface.h b/core/fxge/systemfontinfo_iface.h
index 9a6fbc7..61704be 100644
--- a/core/fxge/systemfontinfo_iface.h
+++ b/core/fxge/systemfontinfo_iface.h
@@ -34,7 +34,6 @@
                                pdfium::span<uint8_t> buffer) = 0;
   virtual bool GetFaceName(void* hFont, ByteString* name) = 0;
   virtual bool GetFontCharset(void* hFont, int* charset) = 0;
-  virtual int GetFaceIndex(void* hFont);
   virtual void DeleteFont(void* hFont) = 0;
 };