Clean up doc_ocg.cpp.

core/fpdfdoc/include/fpdf_doc.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_
 #define CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_
 
 #include <map>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
 #include "core/fxge/include/fx_dib.h"
 
 class CFDF_Document;
 class CFieldTree;
 class CPDF_AAction;
 class CPDF_Action;
@@ skipping 95 matching lines @@
   FX_FLOAT GetParam(int index);
 
  protected:
   CPDF_Object* m_pObj;
 };
 
 class CPDF_OCContext {
  public:
   enum UsageType { View = 0, Design, Print, Export };
 
-  explicit CPDF_OCContext(CPDF_Document* pDoc, UsageType eUsageType = View);
+  CPDF_OCContext(CPDF_Document* pDoc, UsageType eUsageType);
   ~CPDF_OCContext();
 
-  FX_BOOL CheckOCGVisible(const CPDF_Dictionary* pOCGDict);
-  FX_BOOL CheckObjectVisible(const CPDF_PageObject* pObj);
-
-  CPDF_Document* GetDocument() const { return m_pDocument; }
-  UsageType GetUsageType() const { return m_eUsageType; }
-
-  void ResetOCContext();
+  bool CheckOCGVisible(const CPDF_Dictionary* pOCGDict);
+  bool CheckObjectVisible(const CPDF_PageObject* pObj);
 
  protected:
-  FX_BOOL LoadOCGStateFromConfig(const CFX_ByteString& csConfig,
-                                 const CPDF_Dictionary* pOCGDict,
-                                 FX_BOOL& bValidConfig) const;
-  FX_BOOL LoadOCGState(const CPDF_Dictionary* pOCGDict) const;
-  FX_BOOL GetOCGVisible(const CPDF_Dictionary* pOCGDict);
-  FX_BOOL GetOCGVE(CPDF_Array* pExpression,
-                   FX_BOOL bFromConfig,
-                   int nLevel = 0);
-  FX_BOOL LoadOCMDState(const CPDF_Dictionary* pOCMDDict, FX_BOOL bFromConfig);
+  bool LoadOCGStateFromConfig(const CFX_ByteString& csConfig,
+                              const CPDF_Dictionary* pOCGDict) const;
+  bool LoadOCGState(const CPDF_Dictionary* pOCGDict) const;
+  bool GetOCGVisible(const CPDF_Dictionary* pOCGDict);
+  bool GetOCGVE(CPDF_Array* pExpression, int nLevel);
+  bool LoadOCMDState(const CPDF_Dictionary* pOCMDDict);
 
-  CPDF_Document* m_pDocument;
-  UsageType m_eUsageType;
-  std::map<const CPDF_Dictionary*, FX_BOOL> m_OCGStates;
+  CPDF_Document* const m_pDocument;
+  const UsageType m_eUsageType;
+  std::unordered_map<const CPDF_Dictionary*, bool> m_OCGStates;
 };
 
 class CPDF_ActionFields {
  public:
   explicit CPDF_ActionFields(const CPDF_Action* pAction) : m_pAction(pAction) {}
 
   size_t GetFieldsCount() const;
   std::vector<CPDF_Object*> GetAllFields() const;
   CPDF_Object* GetField(size_t iIndex) const;
 
@@ skipping 855 matching lines @@
                         FX_FLOAT fc[4],
                         const CFX_ByteString& csEntry) const;
 
   CFX_WideString GetCaption(const CFX_ByteString& csEntry) const;
   CPDF_Stream* GetIcon(const CFX_ByteString& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 #endif  // CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_