commit d0b6ed1a0842386e474c5fcd6bdbb260bb631bd1
author tsepez <tsepez@chromium.org> Thu Aug 11 19:50:57 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 11 19:50:57 2016 -0700
tree 6d7282f78ac953fc965e17815bcbef7995dd59ec
parent 229d05df5bc5deb3890b26b614113c25d9b6935e

Make FXJS_GetObjectElement return std::vector<CFX_WideString>.

Analogous to getting the length of JS array, this result
should be a C++-side object only.

Also rename to FXJS_GetObjectProperty to match JS nomenclature.

Review-Url: https://codereview.chromium.org/2242593002

fpdfsdk/javascript/global.cpp

diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp
index 10bab26..5ffc559 100644
--- a/fpdfsdk/javascript/global.cpp
+++ b/fpdfsdk/javascript/global.cpp
@@ -273,13 +273,11 @@
                                       CJS_GlobalVariableArray& array) {
   v8::Isolate* isolate = pObj->GetIsolate();
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
-  v8::Local<v8::Array> pKeyList = FXJS_GetObjectElementNames(isolate, pObj);
-  int nObjElements = pKeyList->Length();
-  for (int i = 0; i < nObjElements; i++) {
-    CFX_WideString ws =
-        FXJS_ToString(isolate, FXJS_GetArrayElement(isolate, pKeyList, i));
+  std::vector<CFX_WideString> pKeyList =
+      FXJS_GetObjectPropertyNames(isolate, pObj);
+  for (const auto& ws : pKeyList) {
     CFX_ByteString sKey = ws.UTF8Encode();
-    v8::Local<v8::Value> v = FXJS_GetObjectElement(isolate, pObj, ws);
+    v8::Local<v8::Value> v = FXJS_GetObjectProperty(isolate, pObj, ws);
     switch (CJS_Value::GetValueType(v)) {
       case CJS_Value::VT_number: {
         CJS_KeyValue* pObjElement = new CJS_KeyValue;