Chromium Code Reviews| Index: fpdfsdk/src/javascript/Document.h |
| diff --git a/fpdfsdk/src/javascript/Document.h b/fpdfsdk/src/javascript/Document.h |
| index 3e957a6057bca5fb1bb5c6edba6ba8daa030aab6..84f885fb9ad3cc43726c506a16434baab4ed9421 100644 |
| --- a/fpdfsdk/src/javascript/Document.h |
| +++ b/fpdfsdk/src/javascript/Document.h |
| @@ -7,6 +7,9 @@ |
| #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 { |
| @@ -37,31 +40,13 @@ class Icon; |
| class Field; |
| struct IconElement { |
| - IconElement() : IconName(L""), NextIcon(NULL), IconStream(NULL) {} |
| - virtual ~IconElement() {} |
| + IconElement(CFX_WideString name, Icon* stream) |
|
Lei Zhang
2016/01/05 22:35:31
|name| -> const ref
Tom Sepez
2016/01/05 23:10:09
Done.
|
| + : 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; |
| @@ -295,7 +280,7 @@ class Document : public CJS_EmbedObj { |
| 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; |