Wordstyle not being used to calculate word width

core/fpdfdoc/cpdf_variabletext.cpp

 // Copyright 2016 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 "core/fpdfdoc/include/cpdf_variabletext.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfdoc/cpvt_wordinfo.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 CPDF_VariableText::Provider::Provider(IPVT_FontMap* pFontMap)
     : m_pFontMap(pFontMap) {
   ASSERT(m_pFontMap);
 }
 
 CPDF_VariableText::Provider::~Provider() {}
 
 int32_t CPDF_VariableText::Provider::GetCharWidth(int32_t nFontIndex,
-                                                  uint16_t word,
-                                                  int32_t nWordStyle) {
+                                                  uint16_t word) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     uint32_t charcode = pPDFFont->CharCodeFromUnicode(word);
     if (charcode != CPDF_Font::kInvalidCharCode)
       return pPDFFont->GetCharWidthF(charcode);
   }
   return 0;
 }
 
 int32_t CPDF_VariableText::Provider::GetTypeAscent(int32_t nFontIndex) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex))
@@ skipping 729 matching lines @@
 int32_t CPDF_VariableText::GetWordFontIndex(const CPVT_WordInfo& WordInfo) {
   return WordInfo.nFontIndex;
 }
 
 FX_FLOAT CPDF_VariableText::GetWordWidth(int32_t nFontIndex,
                                          uint16_t Word,
                                          uint16_t SubWord,
                                          FX_FLOAT fCharSpace,
                                          int32_t nHorzScale,
                                          FX_FLOAT fFontSize,
-                                         FX_FLOAT fWordTail,
-                                         int32_t nWordStyle) {
-  return (GetCharWidth(nFontIndex, Word, SubWord, nWordStyle) * fFontSize *
-              kFontScale +
+                                         FX_FLOAT fWordTail) {
+  return (GetCharWidth(nFontIndex, Word, SubWord) * fFontSize * kFontScale +
           fCharSpace) *
              nHorzScale * kScalePercent +
          fWordTail;
 }
 
 FX_FLOAT CPDF_VariableText::GetWordWidth(const CPVT_WordInfo& WordInfo) {
-  return GetWordWidth(
-      GetWordFontIndex(WordInfo), WordInfo.Word, GetSubWord(),
-      GetCharSpace(WordInfo), GetHorzScale(WordInfo), GetWordFontSize(WordInfo),
-      WordInfo.fWordTail,
-      WordInfo.pWordProps ? WordInfo.pWordProps->nWordStyle : 0);
+  return GetWordWidth(GetWordFontIndex(WordInfo), WordInfo.Word, GetSubWord(),
+                      GetCharSpace(WordInfo), GetHorzScale(WordInfo),
+                      GetWordFontSize(WordInfo), WordInfo.fWordTail);
 }
 
 FX_FLOAT CPDF_VariableText::GetLineAscent(const CPVT_SectionInfo& SecInfo) {
   return GetFontAscent(GetDefaultFontIndex(), GetFontSize());
 }
 
 FX_FLOAT CPDF_VariableText::GetLineDescent(const CPVT_SectionInfo& SecInfo) {
   return GetFontDescent(GetDefaultFontIndex(), GetFontSize());
 }
 
@@ skipping 246 matching lines @@
         rcRet.bottom = std::max(rcSec.bottom, rcRet.bottom);
       }
       fPosY += rcSec.Height();
     }
   }
   return rcRet;
 }
 
 int32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex,
                                         uint16_t Word,
-                                        uint16_t SubWord,
-                                        int32_t nWordStyle) {
+                                        uint16_t SubWord) {
   if (!m_pVTProvider)
     return 0;
   uint16_t word = SubWord ? SubWord : Word;
-  return m_pVTProvider->GetCharWidth(nFontIndex, word, nWordStyle);
+  return m_pVTProvider->GetCharWidth(nFontIndex, word);
 }
 
 int32_t CPDF_VariableText::GetTypeAscent(int32_t nFontIndex) {
   return m_pVTProvider ? m_pVTProvider->GetTypeAscent(nFontIndex) : 0;
 }
 
 int32_t CPDF_VariableText::GetTypeDescent(int32_t nFontIndex) {
   return m_pVTProvider ? m_pVTProvider->GetTypeDescent(nFontIndex) : 0;
 }
 
@@ skipping 51 matching lines @@
                        ptLeftTop.y);
 }
 
 CPVT_FloatRect CPDF_VariableText::OutToIn(const CFX_FloatRect& rect) const {
   CFX_FloatPoint ptLeftTop = OutToIn(CFX_FloatPoint(rect.left, rect.top));
   CFX_FloatPoint ptRightBottom =
       OutToIn(CFX_FloatPoint(rect.right, rect.bottom));
   return CPVT_FloatRect(ptLeftTop.x, ptLeftTop.y, ptRightBottom.x,
                         ptRightBottom.y);
 }