From f328d0d378b8df8a3416988d96c34f1d3f9d26d1 Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 18 Oct 2016 15:38:23 -0700 Subject: Make Document::m_IconList a vector of IconElements. There's no need for std::list>. Review-Url: https://codereview.chromium.org/2428743004 --- fpdfsdk/javascript/Document.cpp | 52 ++++++++++++++++++++--------------------- fpdfsdk/javascript/Document.h | 13 ++++++----- 2 files changed, 32 insertions(+), 33 deletions(-) (limited to 'fpdfsdk/javascript') diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index 0b08f66f33..4b597ae127 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -1256,8 +1256,7 @@ FX_BOOL Document::addIcon(IJS_Context* cc, return FALSE; } - m_IconList.push_back(std::unique_ptr( - new IconElement(swIconName, (Icon*)pEmbedObj))); + m_Icons.push_back(IconElement(swIconName, static_cast(pEmbedObj))); return TRUE; } @@ -1270,7 +1269,7 @@ FX_BOOL Document::icons(IJS_Context* cc, } CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc); - if (m_IconList.empty()) { + if (m_Icons.empty()) { vp.GetJSValue()->SetNull(pRuntime); return TRUE; } @@ -1278,7 +1277,7 @@ FX_BOOL Document::icons(IJS_Context* cc, CJS_Array Icons; int i = 0; - for (const auto& pIconElement : m_IconList) { + for (const auto& element : m_Icons) { v8::Local pObj = pRuntime->NewFxDynamicObj(CJS_Icon::g_nObjDefnID); if (pObj.IsEmpty()) @@ -1289,12 +1288,12 @@ FX_BOOL Document::icons(IJS_Context* cc, if (!pJS_Icon) return FALSE; - Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject(); + Icon* pIcon = static_cast(pJS_Icon->GetEmbedObject()); if (!pIcon) return FALSE; - pIcon->SetStream(pIconElement->IconStream->GetStream()); - pIcon->SetIconName(pIconElement->IconName); + pIcon->SetStream(element.IconStream->GetStream()); + pIcon->SetIconName(element.IconName); Icons.SetElement(pRuntime, i++, CJS_Value(pRuntime, pJS_Icon)); } @@ -1311,35 +1310,34 @@ FX_BOOL Document::getIcon(IJS_Context* cc, return FALSE; } - if (m_IconList.empty()) + if (m_Icons.empty()) return FALSE; CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc); CFX_WideString swIconName = params[0].ToCFXWideString(pRuntime); - for (const auto& pIconElement : m_IconList) { - if (pIconElement->IconName == swIconName) { - Icon* pRetIcon = pIconElement->IconStream; + for (const auto& element : m_Icons) { + if (element.IconName != swIconName) + continue; - v8::Local pObj = - pRuntime->NewFxDynamicObj(CJS_Icon::g_nObjDefnID); - if (pObj.IsEmpty()) - return FALSE; + v8::Local pObj = + pRuntime->NewFxDynamicObj(CJS_Icon::g_nObjDefnID); + if (pObj.IsEmpty()) + return FALSE; - CJS_Icon* pJS_Icon = - static_cast(pRuntime->GetObjectPrivate(pObj)); - if (!pJS_Icon) - return FALSE; + CJS_Icon* pJS_Icon = + static_cast(pRuntime->GetObjectPrivate(pObj)); + if (!pJS_Icon) + return FALSE; - Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject(); - if (!pIcon) - return FALSE; + Icon* pIcon = static_cast(pJS_Icon->GetEmbedObject()); + if (!pIcon) + return FALSE; - pIcon->SetIconName(swIconName); - pIcon->SetStream(pRetIcon->GetStream()); - vRet = CJS_Value(pRuntime, pJS_Icon); - return TRUE; - } + pIcon->SetIconName(swIconName); + pIcon->SetStream(element.IconStream->GetStream()); + vRet = CJS_Value(pRuntime, pJS_Icon); + return TRUE; } return FALSE; diff --git a/fpdfsdk/javascript/Document.h b/fpdfsdk/javascript/Document.h index a72316c3d1..d7bf230346 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 pObject) : CJS_Object(pObject) {} + explicit CJS_PrintParamsObj(v8::Local 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> m_DelayData; - std::list> m_IconList; + std::vector m_Icons; bool m_bDelay; }; -- cgit v1.2.3