diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-14 11:04:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-14 11:04:57 -0700 |
| commit | 7b1ccf9697692844e764d730079a0f0b98fd6d06 (patch) | |
| tree | 8e1c0b669a8dd1e06de50454b4e5db5e7c6e1a2a /core/fpdfdoc/doc_formcontrol.cpp | |
| parent | 774bdde253b8394aa2ac791e273508ff006d813a (diff) | |
| download | pdfium-7b1ccf9697692844e764d730079a0f0b98fd6d06.tar.xz | |
Make CPDF_Dictionary methods take CFX_ByteString arguments
This will help avoid duplicate allocation of CFX_ByteStrings
when the caller already has one. It may seem counter-intuitive
that requiring the caller to pass an allocated CFX_ByteString
rather than a static CFX_ByteStringC would improve the situation,
but due to the idiosyncrasies of std::map, the CPDF_Dictionary
methods must always do an allocation under the covers which
can't be avoided.
The changed callers in this CL are places where we would
previously demote to CFX_ByteStringC and then allocate a
a duplicate CFX_ByteString in the dictionary method.
Review URL: https://codereview.chromium.org/1889863002
Diffstat (limited to 'core/fpdfdoc/doc_formcontrol.cpp')
| -rw-r--r-- | core/fpdfdoc/doc_formcontrol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfdoc/doc_formcontrol.cpp b/core/fpdfdoc/doc_formcontrol.cpp index b187ea7999..b833f89c17 100644 --- a/core/fpdfdoc/doc_formcontrol.cpp +++ b/core/fpdfdoc/doc_formcontrol.cpp @@ -78,7 +78,7 @@ void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) { continue; } if (csKey2 != "Off") { - pSubDict->ReplaceKey(csKey2.AsStringC(), csValue.AsStringC()); + pSubDict->ReplaceKey(csKey2, csValue); break; } } @@ -286,7 +286,7 @@ CPDF_Font* CPDF_FormControl::GetDefaultControlFont() { if (CPDF_Dictionary* pDict = ToDictionary(pObj)) { CPDF_Dictionary* pFonts = pDict->GetDictBy("Font"); if (pFonts) { - CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag.AsStringC()); + CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag); if (pElement) { CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement); if (pFont) { @@ -303,7 +303,7 @@ CPDF_Font* CPDF_FormControl::GetDefaultControlFont() { if (CPDF_Dictionary* pDict = ToDictionary(pObj)) { CPDF_Dictionary* pFonts = pDict->GetDictBy("Font"); if (pFonts) { - CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag.AsStringC()); + CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag); if (pElement) { CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement); if (pFont) { |