summaryrefslogtreecommitdiff
path: root/fxjs/cjs_global.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-07-11 13:02:54 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-07-11 13:02:54 +0000
commitb1a4db5551ca7c211c8acbec2b657d25fa7d7f1d (patch)
tree9759d4a4402201ea73df1fee5cfd495b7f103352 /fxjs/cjs_global.cpp
parentcbed949bee845d6ab3e38b3d9b7e832620b64b51 (diff)
downloadpdfium-b1a4db5551ca7c211c8acbec2b657d25fa7d7f1d.tar.xz
Fix some nits in fxjs code.
Change-Id: I533a702947ba371cbc7971d88a3b7dabbc81a298 Reviewed-on: https://pdfium-review.googlesource.com/37511 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/cjs_global.cpp')
-rw-r--r--fxjs/cjs_global.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp
index 6396aa7705..7a319dd4cb 100644
--- a/fxjs/cjs_global.cpp
+++ b/fxjs/cjs_global.cpp
@@ -387,7 +387,7 @@ void CJS_Global::CommitGlobalPersisitentVariables(CJS_Runtime* pRuntime) {
CJS_GlobalVariableArray array;
v8::Local<v8::Object> obj =
v8::Local<v8::Object>::New(GetIsolate(), pData->pData);
- ObjectToArray(pRuntime, obj, array);
+ ObjectToArray(pRuntime, obj, &array);
m_pGlobalData->SetGlobalVariableObject(name, array);
m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
} break;
@@ -401,7 +401,7 @@ void CJS_Global::CommitGlobalPersisitentVariables(CJS_Runtime* pRuntime) {
void CJS_Global::ObjectToArray(CJS_Runtime* pRuntime,
v8::Local<v8::Object> pObj,
- CJS_GlobalVariableArray& array) {
+ CJS_GlobalVariableArray* pArray) {
std::vector<WideString> pKeyList = pRuntime->GetObjectPropertyNames(pObj);
for (const auto& ws : pKeyList) {
ByteString sKey = ws.UTF8Encode();
@@ -411,7 +411,7 @@ void CJS_Global::ObjectToArray(CJS_Runtime* pRuntime,
pObjElement->nType = JS_GlobalDataType::NUMBER;
pObjElement->sKey = sKey;
pObjElement->dData = pRuntime->ToDouble(v);
- array.Add(pObjElement);
+ pArray->Add(pObjElement);
continue;
}
if (v->IsBoolean()) {
@@ -419,7 +419,7 @@ void CJS_Global::ObjectToArray(CJS_Runtime* pRuntime,
pObjElement->nType = JS_GlobalDataType::BOOLEAN;
pObjElement->sKey = sKey;
pObjElement->dData = pRuntime->ToBoolean(v);
- array.Add(pObjElement);
+ pArray->Add(pObjElement);
continue;
}
if (v->IsString()) {
@@ -428,22 +428,22 @@ void CJS_Global::ObjectToArray(CJS_Runtime* pRuntime,
pObjElement->nType = JS_GlobalDataType::STRING;
pObjElement->sKey = sKey;
pObjElement->sData = sValue;
- array.Add(pObjElement);
+ pArray->Add(pObjElement);
continue;
}
if (v->IsObject()) {
CJS_KeyValue* pObjElement = new CJS_KeyValue;
pObjElement->nType = JS_GlobalDataType::OBJECT;
pObjElement->sKey = sKey;
- ObjectToArray(pRuntime, pRuntime->ToObject(v), pObjElement->objData);
- array.Add(pObjElement);
+ ObjectToArray(pRuntime, pRuntime->ToObject(v), &pObjElement->objData);
+ pArray->Add(pObjElement);
continue;
}
if (v->IsNull()) {
CJS_KeyValue* pObjElement = new CJS_KeyValue;
pObjElement->nType = JS_GlobalDataType::NULLOBJ;
pObjElement->sKey = sKey;
- array.Add(pObjElement);
+ pArray->Add(pObjElement);
}
}
}