commit 037eae6e99ef16a42cb74a72b0b52d515a099b3a
author Dan Sinclair <dsinclair@chromium.org> Tue Oct 24 15:29:01 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Tue Oct 24 20:48:32 2017 +0000
tree 4d4b14f1bc05759f628ae0c60903d9412f173e8f
parent 4674441379a2b876ae128ef2e70454dcd14ae2f5

Remove IsArrayObject and IsDateObject methods

This CL removes the IsArrayObject and IsDateObject methods and asks the
v8 objects directly.

Change-Id: I4e2b957dbdfcddb426270f72666fce83854d92e0
Reviewed-on: https://pdfium-review.googlesource.com/16616
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fpdfsdk/javascript/Field.cpp

diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp
index 0ed0594..35b808c 100644
--- a/fpdfsdk/javascript/Field.cpp
+++ b/fpdfsdk/javascript/Field.cpp
@@ -879,7 +879,7 @@
   std::vector<uint32_t> array;
   if (vp.ToV8Value()->IsNumber()) {
     array.push_back(pRuntime->ToInt32(vp.ToV8Value()));
-  } else if (vp.IsArrayObject()) {
+  } else if (!vp.ToV8Value().IsEmpty() && vp.ToV8Value()->IsArray()) {
     CJS_Array SelArray(pRuntime->ToArray(vp.ToV8Value()));
     for (int i = 0, sz = SelArray.GetLength(pRuntime); i < sz; i++)
       array.push_back(
@@ -1210,7 +1210,7 @@
     return false;
   }
 
-  return m_bCanSet && vp.IsArrayObject();
+  return m_bCanSet && !vp.ToV8Value().IsEmpty() && vp.ToV8Value()->IsArray();
 }
 
 bool Field::get_file_select(CJS_Runtime* pRuntime,
@@ -1297,7 +1297,7 @@
     return false;
   if (!m_bCanSet)
     return false;
-  if (!vp.IsArrayObject())
+  if (vp.ToV8Value().IsEmpty() || !vp.ToV8Value()->IsArray())
     return false;
   return true;
 }
@@ -1797,7 +1797,7 @@
                      WideString* sError) {
   if (!m_bCanSet)
     return false;
-  if (!vp.IsArrayObject())
+  if (vp.ToV8Value().IsEmpty() || !vp.ToV8Value()->IsArray())
     return false;
 
   CJS_Array rcArray(pRuntime->ToArray(vp.ToV8Value()));
@@ -2017,7 +2017,7 @@
                              WideString* sError) {
   if (!m_bCanSet)
     return false;
-  if (!vp.IsArrayObject())
+  if (vp.ToV8Value().IsEmpty() || !vp.ToV8Value()->IsArray())
     return false;
   return true;
 }
@@ -2131,7 +2131,7 @@
                            WideString* sError) {
   if (!m_bCanSet)
     return false;
-  if (!vp.IsArrayObject())
+  if (vp.ToV8Value().IsEmpty() || !vp.ToV8Value()->IsArray())
     return false;
   return true;
 }
@@ -2342,7 +2342,7 @@
     return false;
 
   std::vector<WideString> strArray;
-  if (vp.IsArrayObject()) {
+  if (!vp.ToV8Value().IsEmpty() && vp.ToV8Value()->IsArray()) {
     CJS_Array ValueArray(pRuntime->ToArray(vp.ToV8Value()));
     for (int i = 0, sz = ValueArray.GetLength(pRuntime); i < sz; i++) {
       CJS_Value ElementValue(ValueArray.GetElement(pRuntime, i));