Merge to XFA: Replace IconTree class with std::list.

fpdfsdk/src/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_SRC_JAVASCRIPT_DOCUMENT_H_
 #define FPDFSDK_SRC_JAVASCRIPT_DOCUMENT_H_
 
+#include <list>
+#include <memory>
+
 #include "JS_Define.h"
 
 class PrintParamsObj : public CJS_EmbedObj {
  public:
   PrintParamsObj(CJS_Object* pJSObject);
   ~PrintParamsObj() override {}
 
  public:
   FX_BOOL bUI;
   int nStart;
@@ skipping 10 matching lines @@
   CJS_PrintParamsObj(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_PrintParamsObj() override {}
 
   DECLARE_JS_CLASS();
 };
 
 class Icon;
 class Field;
 
 struct IconElement {
-  IconElement() : IconName(L""), NextIcon(NULL), IconStream(NULL) {}
-  virtual ~IconElement() {}
+  IconElement(const CFX_WideString& name, Icon* stream)
+      : IconName(name), IconStream(stream) {}
+
   CFX_WideString IconName;
-  IconElement* NextIcon;
   Icon* IconStream;
 };
 
-class IconTree {
- public:
-  IconTree() : m_pHead(NULL), m_pEnd(NULL), m_iLength(0) {}
-
-  virtual ~IconTree() {}
-
- public:
-  void InsertIconElement(IconElement* pNewIcon);
-  void DeleteIconTree();
-  int GetLength();
-  IconElement* operator[](int iIndex);
-
- private:
-  IconElement* m_pHead;
-  IconElement* m_pEnd;
-  int m_iLength;
-};
-
 struct CJS_DelayData;
 struct CJS_DelayAnnot;
 struct CJS_AnnotObj;
 
 class Document : public CJS_EmbedObj {
  public:
   Document(CJS_Object* pJSObject);
   ~Document() override;
 
  public:
@@ skipping 213 matching lines @@
   CJS_Document* GetCJSDoc() const;
 
  private:
   CFX_WideString ReversalStr(CFX_WideString cbFrom);
   CFX_WideString CutString(CFX_WideString cbFrom);
   bool IsEnclosedInRect(CFX_FloatRect rect, CFX_FloatRect LinkRect);
   int CountWords(CPDF_TextObject* pTextObj);
   CFX_WideString GetObjWordStr(CPDF_TextObject* pTextObj, int nWordIndex);
 
   v8::Isolate* m_isolate;
-  IconTree* m_pIconTree;
+  std::list<std::unique_ptr<IconElement>> m_IconList;
   CPDFSDK_Document* m_pDocument;
   CFX_WideString m_cwBaseURL;
   bool m_bDelay;
   CFX_ArrayTemplate<CJS_DelayData*> m_DelayData;
   CFX_ArrayTemplate<CJS_AnnotObj*> m_DelayAnnotData;
 };
 
 class CJS_Document : public CJS_Object {
  public:
   explicit CJS_Document(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
@@ skipping 72 matching lines @@
   JS_STATIC_METHOD(removeField, Document);
   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(mailDoc, Document);
 };
 
 #endif  // FPDFSDK_SRC_JAVASCRIPT_DOCUMENT_H_