From 037eae6e99ef16a42cb74a72b0b52d515a099b3a Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 24 Oct 2017 15:29:01 -0400 Subject: 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 Reviewed-by: Tom Sepez --- fpdfsdk/javascript/color.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/javascript/color.cpp') diff --git a/fpdfsdk/javascript/color.cpp b/fpdfsdk/javascript/color.cpp index 56baa59019..c095678732 100644 --- a/fpdfsdk/javascript/color.cpp +++ b/fpdfsdk/javascript/color.cpp @@ -289,7 +289,7 @@ bool color::GetPropertyHelper(CJS_Runtime* pRuntime, bool color::SetPropertyHelper(CJS_Runtime* pRuntime, const CJS_Value& vp, CFX_Color* var) { - if (!vp.IsArrayObject()) + if (vp.ToV8Value().IsEmpty() || !vp.ToV8Value()->IsArray()) return false; *var = ConvertArrayToPWLColor(pRuntime, @@ -304,7 +304,7 @@ bool color::convert(CJS_Runtime* pRuntime, int iSize = params.size(); if (iSize < 2) return false; - if (!params[0].IsArrayObject()) + if (params[0].ToV8Value().IsEmpty() || !params[0].ToV8Value()->IsArray()) return false; WideString sDestSpace = pRuntime->ToWideString(params[1].ToV8Value()); @@ -337,8 +337,10 @@ bool color::equal(CJS_Runtime* pRuntime, WideString& sError) { if (params.size() < 2) return false; - if (!params[0].IsArrayObject() || !params[1].IsArrayObject()) + if (params[0].ToV8Value().IsEmpty() || !params[0].ToV8Value()->IsArray() || + params[1].ToV8Value().IsEmpty() || !params[1].ToV8Value()->IsArray()) { return false; + } CFX_Color color1 = ConvertArrayToPWLColor( pRuntime, CJS_Array(pRuntime->ToArray(params[0].ToV8Value()))); -- cgit v1.2.3