diff options
Diffstat (limited to 'fxjs/cjs_global.cpp')
-rw-r--r-- | fxjs/cjs_global.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp index d9338abcfd..ecf06f10cb 100644 --- a/fxjs/cjs_global.cpp +++ b/fxjs/cjs_global.cpp @@ -418,43 +418,43 @@ void CJS_Global::ObjectToArray(CJS_Runtime* pRuntime, ByteString sKey = ws.UTF8Encode(); v8::Local<v8::Value> v = pRuntime->GetObjectProperty(pObj, ws); if (v->IsNumber()) { - CJS_KeyValue* pObjElement = new CJS_KeyValue; + auto pObjElement = pdfium::MakeUnique<CJS_KeyValue>(); pObjElement->nType = JS_GlobalDataType::NUMBER; pObjElement->sKey = sKey; pObjElement->dData = pRuntime->ToDouble(v); - pArray->Add(pObjElement); + pArray->Add(std::move(pObjElement)); continue; } if (v->IsBoolean()) { - CJS_KeyValue* pObjElement = new CJS_KeyValue; + auto pObjElement = pdfium::MakeUnique<CJS_KeyValue>(); pObjElement->nType = JS_GlobalDataType::BOOLEAN; pObjElement->sKey = sKey; pObjElement->dData = pRuntime->ToBoolean(v); - pArray->Add(pObjElement); + pArray->Add(std::move(pObjElement)); continue; } if (v->IsString()) { ByteString sValue = pRuntime->ToWideString(v).ToDefANSI(); - CJS_KeyValue* pObjElement = new CJS_KeyValue; + auto pObjElement = pdfium::MakeUnique<CJS_KeyValue>(); pObjElement->nType = JS_GlobalDataType::STRING; pObjElement->sKey = sKey; pObjElement->sData = sValue; - pArray->Add(pObjElement); + pArray->Add(std::move(pObjElement)); continue; } if (v->IsObject()) { - CJS_KeyValue* pObjElement = new CJS_KeyValue; + auto pObjElement = pdfium::MakeUnique<CJS_KeyValue>(); pObjElement->nType = JS_GlobalDataType::OBJECT; pObjElement->sKey = sKey; ObjectToArray(pRuntime, pRuntime->ToObject(v), &pObjElement->objData); - pArray->Add(pObjElement); + pArray->Add(std::move(pObjElement)); continue; } if (v->IsNull()) { - CJS_KeyValue* pObjElement = new CJS_KeyValue; + auto pObjElement = pdfium::MakeUnique<CJS_KeyValue>(); pObjElement->nType = JS_GlobalDataType::NULLOBJ; pObjElement->sKey = sKey; - pArray->Add(pObjElement); + pArray->Add(std::move(pObjElement)); } } } |