summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/cpdf_variabletext.cpp
diff options
context:
space:
mode:
authornpm <npm@chromium.org>2016-09-14 11:54:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-14 11:54:44 -0700
commit41d6bbe3d413e7854be89142b70c42a89e315cba (patch)
treeeb1515b93e1b1652b1aab1a88255221279e288a8 /core/fpdfdoc/cpdf_variabletext.cpp
parent1f2489023f2b808c41071d992abceb646ade8e1b (diff)
downloadpdfium-41d6bbe3d413e7854be89142b70c42a89e315cba.tar.xz
Delete unused parameter nWordStyle from GetCharWidth()chromium/2861
Deleted parameter from callers, who also do not use it. Review-Url: https://codereview.chromium.org/2337973004
Diffstat (limited to 'core/fpdfdoc/cpdf_variabletext.cpp')
-rw-r--r--core/fpdfdoc/cpdf_variabletext.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp
index 4527fd0367..8356c1620b 100644
--- a/core/fpdfdoc/cpdf_variabletext.cpp
+++ b/core/fpdfdoc/cpdf_variabletext.cpp
@@ -34,8 +34,7 @@ CPDF_VariableText::Provider::Provider(IPVT_FontMap* 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)
@@ -785,21 +784,17 @@ FX_FLOAT CPDF_VariableText::GetWordWidth(int32_t nFontIndex,
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) {
@@ -1066,12 +1061,11 @@ CPVT_FloatRect CPDF_VariableText::RearrangeSections(
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) {