diff options
| author | thestig <thestig@chromium.org> | 2016-10-19 13:29:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-19 13:29:48 -0700 |
| commit | dadea5f87d35f8a692b659dbff54cc8780d48ef8 (patch) | |
| tree | eaa090007d1ee40cfdf889fa8dbfb46c6fe2a6fc /fpdfsdk/javascript/Document.h | |
| parent | e58febc04514694935fcdf00f604419a1e5076b0 (diff) | |
| download | pdfium-dadea5f87d35f8a692b659dbff54cc8780d48ef8.tar.xz | |
Make Document::m_IconList a vector of IconElements. (try 2)chromium/2896
It does not need to be a std::list. This time keep the elements as
unique_ptrs.
Previous attempt: https://codereview.chromium.org/2428743004/
Review-Url: https://chromiumcodereview.appspot.com/2428373004
Diffstat (limited to 'fpdfsdk/javascript/Document.h')
| -rw-r--r-- | fpdfsdk/javascript/Document.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fpdfsdk/javascript/Document.h b/fpdfsdk/javascript/Document.h index a72316c3d1..129411a431 100644 --- a/fpdfsdk/javascript/Document.h +++ b/fpdfsdk/javascript/Document.h @@ -18,7 +18,7 @@ class PrintParamsObj : public CJS_EmbedObj { public: - PrintParamsObj(CJS_Object* pJSObject); + explicit PrintParamsObj(CJS_Object* pJSObject); ~PrintParamsObj() override {} public: @@ -34,7 +34,8 @@ class PrintParamsObj : public CJS_EmbedObj { 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(); @@ -47,8 +48,8 @@ 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; @@ -57,7 +58,7 @@ 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); @@ -291,7 +292,7 @@ class Document : public CJS_EmbedObj { 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; }; |