From 74a30b76a0a50fc92cb567fa2a9e3500f04c0883 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Mon, 18 Jul 2016 10:18:56 -0700
Subject: Remove default params in CPDF_VariableText.

This Cl cleans up the default params and any supporting code if necessary.

Review-Url: https://codereview.chromium.org/2146993002
---
 core/fpdfdoc/cpdf_variabletext.cpp | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'core/fpdfdoc/cpdf_variabletext.cpp')

diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp
index 082af3775c..a4f9d8923f 100644
--- a/core/fpdfdoc/cpdf_variabletext.cpp
+++ b/core/fpdfdoc/cpdf_variabletext.cpp
@@ -335,10 +335,7 @@ CPVT_WordPlace CPDF_VariableText::InsertSection(
 }
 
 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++) {
@@ -350,7 +347,7 @@ CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place,
           if (swText.GetAt(i + 1) == 0x0A)
             i += 1;
 
-          wp = InsertSection(wp, pSecProps, pProps);
+          wp = InsertSection(wp, nullptr, nullptr);
         }
         break;
       case 0x0A:
@@ -358,13 +355,13 @@ CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place,
           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)
@@ -396,10 +393,7 @@ 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);
@@ -441,7 +435,7 @@ void CPDF_VariableText::SetText(const FX_WCHAR* text,
       case 0x09:
         word = 0x20;
       default:
-        wp = InsertWord(wp, word, charset, pWordProps);
+        wp = InsertWord(wp, word, FXFONT_DEFAULT_CHARSET, nullptr);
         break;
     }
     nCharCount++;
@@ -773,8 +767,7 @@ 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();
 }
 
@@ -833,16 +826,12 @@ FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo& WordInfo,
   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) {
-- 
cgit v1.2.3