Make Document::m_IconList a vector of IconElements. (try 2)

fpdfsdk/javascript/Document.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 FPDFSDK_JAVASCRIPT_DOCUMENT_H_
 #define FPDFSDK_JAVASCRIPT_DOCUMENT_H_
 
 #include <list>
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fpdfapi/page/cpdf_textobject.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 
 class PrintParamsObj : public CJS_EmbedObj {
  public:
-  PrintParamsObj(CJS_Object* pJSObject);
+  explicit PrintParamsObj(CJS_Object* pJSObject);
   ~PrintParamsObj() override {}
 
  public:
   FX_BOOL bUI;
   int nStart;
   int nEnd;
   FX_BOOL bSilent;
   FX_BOOL bShrinkToFit;
   FX_BOOL bPrintAsImage;
   FX_BOOL bReverse;
   FX_BOOL bAnnotations;
 };
 
 class CJS_PrintParamsObj : public CJS_Object {
  public:
-  CJS_PrintParamsObj(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
+  explicit CJS_PrintParamsObj(v8::Local<v8::Object> pObject)
+      : CJS_Object(pObject) {}
   ~CJS_PrintParamsObj() override {}
 
   DECLARE_JS_CLASS();
 };
 
 class Icon;
 class Field;
 
 struct IconElement {
   IconElement(const CFX_WideString& name, Icon* stream)
       : IconName(name), IconStream(stream) {}
 
-  CFX_WideString IconName;
-  Icon* IconStream;
+  const CFX_WideString IconName;
+  Icon* const IconStream;
 };
 
 struct CJS_DelayData;
 struct CJS_DelayAnnot;
 struct CJS_AnnotObj;
 
 class Document : public CJS_EmbedObj {
  public:
-  Document(CJS_Object* pJSObject);
+  explicit Document(CJS_Object* pJSObject);
   ~Document() override;
 
   FX_BOOL ADBE(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL author(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL baseURL(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL bookmarkRoot(IJS_Context* cc,
                        CJS_PropValue& vp,
                        CFX_WideString& sError);
   FX_BOOL calculate(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL Collab(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
@@ skipping 213 matching lines @@
   CFX_WideString GetObjWordStr(CPDF_TextObject* pTextObj, int nWordIndex);
 
   FX_BOOL getPropertyInternal(IJS_Context* cc,
                               CJS_PropValue& vp,
                               const CFX_ByteString& propName,
                               CFX_WideString& sError);
 
   CPDFSDK_FormFillEnvironment::ObservedPtr m_pFormFillEnv;
   CFX_WideString m_cwBaseURL;
   std::list<std::unique_ptr<CJS_DelayData>> m_DelayData;
-  std::list<std::unique_ptr<IconElement>> m_IconList;
+  std::vector<std::unique_ptr<IconElement>> m_Icons;
   bool m_bDelay;
 };
 
 class CJS_Document : public CJS_Object {
  public:
   explicit CJS_Document(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Document() override {}
 
   // CJS_Object
   void InitInstance(IJS_Runtime* pIRuntime) override;
@@ skipping 71 matching lines @@
   JS_STATIC_METHOD(replacePages, Document);
   JS_STATIC_METHOD(removeIcon, Document);
   JS_STATIC_METHOD(resetForm, Document);
   JS_STATIC_METHOD(saveAs, Document);
   JS_STATIC_METHOD(submitForm, Document);
   JS_STATIC_METHOD(syncAnnotScan, Document);
   JS_STATIC_METHOD(mailDoc, Document);
 };
 
 #endif  // FPDFSDK_JAVASCRIPT_DOCUMENT_H_