commit 6d82d95f2dd0b0aed10d205e29b3244af467211b
author Lei Zhang <thestig@chromium.org> Wed Jul 31 23:09:11 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jul 31 23:09:11 2019 +0000
tree 9767168f342291e482b1ee7e922738e9dbbad846
parent 8f03cd483bfd3f2b57fd3929e79d271f0b8874df

Initialize CPDF_CMap members in the header.

Also order them to potentially pack tighter.

Change-Id: I1bd6419e4c8627f79745099f7f23be6160db1594
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/58554
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@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 8615084..6b54241 100644
--- a/core/fpdfapi/font/cpdf_cmap.cpp
+++ b/core/fpdfapi/font/cpdf_cmap.cpp
@@ -238,15 +238,9 @@
 
 }  // namespace
 
-CPDF_CMap::CPDF_CMap()
-    : m_bLoaded(false),
-      m_bVertical(false),
-      m_Charset(CIDSET_UNKNOWN),
-      m_CodingScheme(TwoBytes),
-      m_Coding(CIDCODING_UNKNOWN),
-      m_pEmbedMap(nullptr) {}
+CPDF_CMap::CPDF_CMap() = default;
 
-CPDF_CMap::~CPDF_CMap() {}
+CPDF_CMap::~CPDF_CMap() = default;
 
 void CPDF_CMap::LoadPredefined(CPDF_CMapManager* pMgr,
                                const ByteString& bsName) {

core/fpdfapi/font/cpdf_cmap.h

diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h
index 2c0503a..2afa3f1 100644
--- a/core/fpdfapi/font/cpdf_cmap.h
+++ b/core/fpdfapi/font/cpdf_cmap.h
@@ -89,12 +89,12 @@
   CPDF_CMap();
   ~CPDF_CMap() override;
 
+  bool m_bLoaded = false;
+  bool m_bVertical = false;
+  CIDSet m_Charset = CIDSET_UNKNOWN;
+  CodingScheme m_CodingScheme = TwoBytes;
+  int m_Coding = CIDCODING_UNKNOWN;
   ByteString m_PredefinedCMap;
-  bool m_bLoaded;
-  bool m_bVertical;
-  CIDSet m_Charset;
-  CodingScheme m_CodingScheme;
-  int m_Coding;
   std::vector<bool> m_MixedTwoByteLeadingBytes;
   std::vector<CodeRange> m_MixedFourByteLeadingRanges;
   std::vector<uint16_t> m_DirectCharcodeToCIDTable;