Remove default params in CPDF_VariableText.

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 317 matching lines @@
           pNewSection->AddWord(NewPlace, *pWord);
         }
       }
     }
     ClearSectionRightWords(wordplace);
   }
   return newplace;
 }
 
 CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place,
-                                             const FX_WCHAR* text,
-                                             int32_t charset,
-                                             const CPVT_SecProps* pSecProps,
-                                             const CPVT_WordProps* pProps) {
+                                             const FX_WCHAR* text) {
   CFX_WideString swText = text;
   CPVT_WordPlace wp = place;
   for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
     CPVT_WordPlace oldwp = wp;
     uint16_t word = swText.GetAt(i);
     switch (word) {
       case 0x0D:
         if (m_bMultiLine) {
           if (swText.GetAt(i + 1) == 0x0A)
             i += 1;
 
-          wp = InsertSection(wp, pSecProps, pProps);
+          wp = InsertSection(wp, nullptr, nullptr);
         }
         break;
       case 0x0A:
         if (m_bMultiLine) {
           if (swText.GetAt(i + 1) == 0x0D)
             i += 1;
 
-          wp = InsertSection(wp, pSecProps, pProps);
+          wp = InsertSection(wp, nullptr, nullptr);
         }
         break;
       case 0x09:
         word = 0x20;
       default:
-        wp = InsertWord(wp, word, charset, pProps);
+        wp = InsertWord(wp, word, FXFONT_DEFAULT_CHARSET, nullptr);
         break;
     }
     if (wp == oldwp)
       break;
   }
   return wp;
 }
 
 CPVT_WordPlace CPDF_VariableText::DeleteWords(
     const CPVT_WordRange& PlaceRange) {
@@ skipping 11 matching lines @@
 }
 
 CPVT_WordPlace CPDF_VariableText::DeleteWord(const CPVT_WordPlace& place) {
   return ClearRightWord(AdjustLineHeader(place, TRUE));
 }
 
 CPVT_WordPlace CPDF_VariableText::BackSpaceWord(const CPVT_WordPlace& place) {
   return ClearLeftWord(AdjustLineHeader(place, TRUE));
 }
 
-void CPDF_VariableText::SetText(const FX_WCHAR* text,
-                                int32_t charset,
-                                const CPVT_SecProps* pSecProps,
-                                const CPVT_WordProps* pWordProps) {
+void CPDF_VariableText::SetText(const FX_WCHAR* text) {
   DeleteWords(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
   CFX_WideString swText = text;
   CPVT_WordPlace wp(0, 0, -1);
   CPVT_SectionInfo secinfo;
   if (CSection* pSection = m_SectionArray.GetAt(0))
     pSection->m_SecInfo = secinfo;
 
   int32_t nCharCount = 0;
   for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
     if (m_nLimitChar > 0 && nCharCount >= m_nLimitChar)
@@ skipping 21 matching lines @@
 
           wp.nSecIndex++;
           wp.nLineIndex = 0;
           wp.nWordIndex = -1;
           AddSection(wp, secinfo);
         }
         break;
       case 0x09:
         word = 0x20;
       default:
-        wp = InsertWord(wp, word, charset, pWordProps);
+        wp = InsertWord(wp, word, FXFONT_DEFAULT_CHARSET, nullptr);
         break;
     }
     nCharCount++;
   }
 }
 
 void CPDF_VariableText::UpdateWordPlace(CPVT_WordPlace& place) const {
   if (place.nSecIndex < 0)
     place = GetBeginWordPlace();
   if (place.nSecIndex >= m_SectionArray.GetSize())
@@ skipping 311 matching lines @@
 }
 
 CFX_FloatRect CPDF_VariableText::GetContentRect() const {
   return InToOut(CPVT_FloatRect(CPDF_EditContainer::GetContentRect()));
 }
 
 const CFX_FloatRect& CPDF_VariableText::GetPlateRect() const {
   return CPDF_EditContainer::GetPlateRect();
 }
 
-FX_FLOAT CPDF_VariableText::GetWordFontSize(const CPVT_WordInfo& WordInfo,
-                                            FX_BOOL bFactFontSize) {
+FX_FLOAT CPDF_VariableText::GetWordFontSize(const CPVT_WordInfo& WordInfo) {
   return GetFontSize();
 }
 
 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,
@@ skipping 38 matching lines @@
 FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo& WordInfo,
                                           FX_FLOAT fFontSize) {
   return GetFontAscent(GetWordFontIndex(WordInfo), fFontSize);
 }
 
 FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo& WordInfo,
                                            FX_FLOAT fFontSize) {
   return GetFontDescent(GetWordFontIndex(WordInfo), fFontSize);
 }
 
-FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo& WordInfo,
-                                          FX_BOOL bFactFontSize) {
-  return GetFontAscent(GetWordFontIndex(WordInfo),
-                       GetWordFontSize(WordInfo, bFactFontSize));
+FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo& WordInfo) {
+  return GetFontAscent(GetWordFontIndex(WordInfo), GetWordFontSize(WordInfo));
 }
 
-FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo& WordInfo,
-                                           FX_BOOL bFactFontSize) {
-  return GetFontDescent(GetWordFontIndex(WordInfo),
-                        GetWordFontSize(WordInfo, bFactFontSize));
+FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo& WordInfo) {
+  return GetFontDescent(GetWordFontIndex(WordInfo), GetWordFontSize(WordInfo));
 }
 
 FX_FLOAT CPDF_VariableText::GetLineLeading(const CPVT_SectionInfo& SecInfo) {
   return m_fLineLeading;
 }
 
 FX_FLOAT CPDF_VariableText::GetLineIndent(const CPVT_SectionInfo& SecInfo) {
   return 0.0f;
 }
 
@@ skipping 251 matching lines @@
 
 CPDF_VariableText::Iterator* CPDF_VariableText::GetIterator() {
   if (!m_pVTIterator)
     m_pVTIterator.reset(new CPDF_VariableText::Iterator(this));
   return m_pVTIterator.get();
 }
 
 void CPDF_VariableText::SetProvider(CPDF_VariableText::Provider* pProvider) {
   m_pVTProvider = pProvider;
 }