commit 12c357b447a45e4a10a96426e84c4fa495774108
author Lei Zhang <thestig@chromium.org> Mon Aug 12 22:38:58 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Aug 12 22:38:58 2019 +0000
tree 1f65a76ebac660a91cfb92401cfee2d1bce3c0e6
parent 6d27a1e71a8944bf3db6acf28859379044eee38e

Remove |CPDF_CMap::m_PredefinedCMap|.

It is only used within CPDF_CMap::LoadPredefined(), where the same
ByteString already exists as a method parameter.

Change-Id: I81c2830541c183891fbbd290e16d261c7a72326e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/59215
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/font/cpdf_cmap.cpp

diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp
index db87abf..0ff688f 100644
--- a/core/fpdfapi/font/cpdf_cmap.cpp
+++ b/core/fpdfapi/font/cpdf_cmap.cpp
@@ -242,14 +242,13 @@
 CPDF_CMap::~CPDF_CMap() = default;
 
 void CPDF_CMap::LoadPredefined(const ByteString& bsName) {
-  m_PredefinedCMap = bsName;
-  if (m_PredefinedCMap == "Identity-H" || m_PredefinedCMap == "Identity-V") {
+  if (bsName == "Identity-H" || bsName == "Identity-V") {
     m_Coding = CIDCODING_CID;
     m_bVertical = bsName.Last() == 'V';
     m_bLoaded = true;
     return;
   }
-  ByteString cmapid = m_PredefinedCMap;
+  ByteString cmapid = bsName;
   m_bVertical = cmapid.Last() == 'V';
   if (cmapid.GetLength() > 2) {
     cmapid = cmapid.Left(cmapid.GetLength() - 2);

core/fpdfapi/font/cpdf_cmap.h

diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h
index ccf3c97..92a62e3 100644
--- a/core/fpdfapi/font/cpdf_cmap.h
+++ b/core/fpdfapi/font/cpdf_cmap.h
@@ -93,7 +93,6 @@
   CIDSet m_Charset = CIDSET_UNKNOWN;
   CodingScheme m_CodingScheme = TwoBytes;
   int m_Coding = CIDCODING_UNKNOWN;
-  ByteString m_PredefinedCMap;
   std::vector<bool> m_MixedTwoByteLeadingBytes;
   std::vector<CodeRange> m_MixedFourByteLeadingRanges;
   std::vector<uint16_t> m_DirectCharcodeToCIDTable;