From 0bb1333a9eff1190ddd68f34c71d6a779c69dfef Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 30 Mar 2017 16:12:02 -0400 Subject: Add some calls to MakeUnique This CL replaces some new's with pdfium::MakeUnique. Change-Id: I50faf3ed55e7730b094c14a7989a9dd51cf33cbb Reviewed-on: https://pdfium-review.googlesource.com/3430 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/javascript/JS_GlobalData.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/javascript/JS_GlobalData.cpp') diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp index 048fca0591..14202646c5 100644 --- a/fpdfsdk/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/javascript/JS_GlobalData.cpp @@ -9,6 +9,7 @@ #include #include "core/fdrm/crypto/fx_crypt.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #define JS_MAXGLOBALDATA (1024 * 4 - 8) @@ -104,7 +105,7 @@ void CJS_GlobalData::SetGlobalVariableNumber(const CFX_ByteString& propname, pData->data.dData = dData; return; } - std::unique_ptr pNewData(new CJS_GlobalData_Element); + auto pNewData = pdfium::MakeUnique(); pNewData->data.sKey = sPropName; pNewData->data.nType = JS_GlobalDataType::NUMBER; pNewData->data.dData = dData; @@ -122,7 +123,7 @@ void CJS_GlobalData::SetGlobalVariableBoolean(const CFX_ByteString& propname, pData->data.bData = bData; return; } - std::unique_ptr pNewData(new CJS_GlobalData_Element); + auto pNewData = pdfium::MakeUnique(); pNewData->data.sKey = sPropName; pNewData->data.nType = JS_GlobalDataType::BOOLEAN; pNewData->data.bData = bData; @@ -140,7 +141,7 @@ void CJS_GlobalData::SetGlobalVariableString(const CFX_ByteString& propname, pData->data.sData = sData; return; } - std::unique_ptr pNewData(new CJS_GlobalData_Element); + auto pNewData = pdfium::MakeUnique(); pNewData->data.sKey = sPropName; pNewData->data.nType = JS_GlobalDataType::STRING; pNewData->data.sData = sData; @@ -159,7 +160,7 @@ void CJS_GlobalData::SetGlobalVariableObject( pData->data.objData.Copy(array); return; } - std::unique_ptr pNewData(new CJS_GlobalData_Element); + auto pNewData = pdfium::MakeUnique(); pNewData->data.sKey = sPropName; pNewData->data.nType = JS_GlobalDataType::OBJECT; pNewData->data.objData.Copy(array); @@ -175,7 +176,7 @@ void CJS_GlobalData::SetGlobalVariableNull(const CFX_ByteString& propname) { pData->data.nType = JS_GlobalDataType::NULLOBJ; return; } - std::unique_ptr pNewData(new CJS_GlobalData_Element); + auto pNewData = pdfium::MakeUnique(); pNewData->data.sKey = sPropName; pNewData->data.nType = JS_GlobalDataType::NULLOBJ; m_arrayGlobalData.push_back(std::move(pNewData)); -- cgit v1.2.3