summaryrefslogtreecommitdiff
path: root/core/fpdfdoc
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-03-28 17:02:46 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-03-28 17:02:46 +0000
commit14094f22d9a7bfde8673689218a88d6feb02f3ee (patch)
treea4a2016b9984b50e80680a182f52d41b58e8894e /core/fpdfdoc
parent8eac5ad73918818569859cd0453a1d5a44a1f81b (diff)
downloadpdfium-14094f22d9a7bfde8673689218a88d6feb02f3ee.tar.xz
Remove ByteString PDF_NameDecode
This CL removes the ByteString version of PDF_NameDecode and forces the callers to use the ByteStringView variant. Change-Id: I5a955d8e909e2045ee45843af54b23e98abe00ed Reviewed-on: https://pdfium-review.googlesource.com/29350 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
-rw-r--r--core/fpdfdoc/cpdf_defaultappearance.cpp2
-rw-r--r--core/fpdfdoc/cpdf_interform.cpp2
-rw-r--r--core/fpdfdoc/cpvt_generateap.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp
index ba0679a19a..cae553a7c2 100644
--- a/core/fpdfdoc/cpdf_defaultappearance.cpp
+++ b/core/fpdfdoc/cpdf_defaultappearance.cpp
@@ -32,7 +32,7 @@ ByteString CPDF_DefaultAppearance::GetFont(float* fFontSize) {
csFontNameTag.Delete(0, 1);
*fFontSize = FX_atof(syntax.GetWord());
}
- return PDF_NameDecode(csFontNameTag);
+ return PDF_NameDecode(csFontNameTag.AsStringView());
}
bool CPDF_DefaultAppearance::HasColor() {
diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp
index ac15aa66cc..c16c36ef3d 100644
--- a/core/fpdfdoc/cpdf_interform.cpp
+++ b/core/fpdfdoc/cpdf_interform.cpp
@@ -101,7 +101,7 @@ void InitDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument) {
CPDF_Font* GetFont(CPDF_Dictionary* pFormDict,
CPDF_Document* pDocument,
const ByteString& csNameTag) {
- ByteString csAlias = PDF_NameDecode(csNameTag);
+ ByteString csAlias = PDF_NameDecode(csNameTag.AsStringView());
if (!pFormDict || csAlias.IsEmpty())
return nullptr;
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index e2fbcc9720..4138b21a6b 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -925,7 +925,7 @@ void CPVT_GenerateAP::GenerateFormAP(Type type,
CPDF_SimpleParser syntax(DA.AsStringView());
syntax.FindTagParamFromStart("Tf", 2);
ByteString sFontName(syntax.GetWord());
- sFontName = PDF_NameDecode(sFontName);
+ sFontName = PDF_NameDecode(sFontName.AsStringView());
if (sFontName.IsEmpty())
return;