diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-18 19:26:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-18 19:26:31 -0700 |
| commit | 09bad1cf251c68d1492af4049e1324a46d9c9725 (patch) | |
| tree | 55465962c9010da1859a1fb3ffcf1f53d3fe414b /fpdfsdk/javascript/Document.h | |
| parent | 4e903136cf0f02578c0e47c6738b633c96814b62 (diff) | |
| download | pdfium-09bad1cf251c68d1492af4049e1324a46d9c9725.tar.xz | |
Revert of Make Document::m_IconList a vector of IconElements. (patchset #2 id:20001 of https://codereview.chromium.org/2428743004/ )
Reason for revert:
Appears to be blocking the roll due to compile failure https://codereview.chromium.org/2429053002
Attempting to revert to see if the roll will pass.
Original issue's description:
> Make Document::m_IconList a vector of IconElements.
>
> There's no need for std::list<std::unique_ptr<IconElement>>.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/f328d0d378b8df8a3416988d96c34f1d3f9d26d1
TBR=npm@chromium.org,thestig@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://chromiumcodereview.appspot.com/2431913003
Diffstat (limited to 'fpdfsdk/javascript/Document.h')
| -rw-r--r-- | fpdfsdk/javascript/Document.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fpdfsdk/javascript/Document.h b/fpdfsdk/javascript/Document.h index d7bf230346..a72316c3d1 100644 --- a/fpdfsdk/javascript/Document.h +++ b/fpdfsdk/javascript/Document.h @@ -18,7 +18,7 @@ class PrintParamsObj : public CJS_EmbedObj { public: - explicit PrintParamsObj(CJS_Object* pJSObject); + PrintParamsObj(CJS_Object* pJSObject); ~PrintParamsObj() override {} public: @@ -34,8 +34,7 @@ class PrintParamsObj : public CJS_EmbedObj { class CJS_PrintParamsObj : public CJS_Object { public: - explicit CJS_PrintParamsObj(v8::Local<v8::Object> pObject) - : CJS_Object(pObject) {} + CJS_PrintParamsObj(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {} ~CJS_PrintParamsObj() override {} DECLARE_JS_CLASS(); @@ -48,8 +47,8 @@ struct IconElement { IconElement(const CFX_WideString& name, Icon* stream) : IconName(name), IconStream(stream) {} - const CFX_WideString IconName; - Icon* const IconStream; + CFX_WideString IconName; + Icon* IconStream; }; struct CJS_DelayData; @@ -58,7 +57,7 @@ struct CJS_AnnotObj; class Document : public CJS_EmbedObj { public: - explicit Document(CJS_Object* pJSObject); + Document(CJS_Object* pJSObject); ~Document() override; FX_BOOL ADBE(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); @@ -292,7 +291,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::vector<IconElement> m_Icons; + std::list<std::unique_ptr<IconElement>> m_IconList; bool m_bDelay; }; |