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/PublicMethods.cpp

diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index 68fc305..200e7d1 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -247,7 +247,7 @@
 
 CJS_Array CJS_PublicMethods::AF_MakeArrayFromList(CJS_Runtime* pRuntime,
                                                   CJS_Value val) {
-  if (val.IsArrayObject())
+  if (!val.ToV8Value().IsEmpty() && val.ToV8Value()->IsArray())
     return CJS_Array(pRuntime->ToArray(val.ToV8Value()));
 
   WideString wsStr = pRuntime->ToWideString(val.ToV8Value());
@@ -1675,7 +1675,8 @@
   }
 
   CJS_Value params1(params[1]);
-  if (!params1.IsArrayObject() && !params1.ToV8Value()->IsString()) {
+  if ((params[1].ToV8Value().IsEmpty() || !params[1].ToV8Value()->IsArray()) &&
+      !params1.ToV8Value()->IsString()) {
     sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR);
     return false;
   }