From 0e187d80179fe63c11cfb710ecd18b95b39dfa10 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 23 Oct 2017 12:08:34 -0400 Subject: Cleanup some javascript color code This CL changes the color conversion methods to return their result instead of taking an out param. Change-Id: I19ca2b395145866533c7f93cbad80cdf4d7df05d Reviewed-on: https://pdfium-review.googlesource.com/16530 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fpdfsdk/javascript/PublicMethods.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'fpdfsdk/javascript/PublicMethods.cpp') diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index 2e7387e9d2..5e428007ad 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -924,16 +924,12 @@ bool CJS_PublicMethods::AFNumber_Format(CJS_Runtime* pRuntime, CJS_Value vProp(pRuntime); fTarget->get_text_color(pRuntime, &vProp, &sError); - CJS_Array aProp = vProp.ToArray(pRuntime); - CFX_Color crProp; - CFX_Color crColor; - color::ConvertArrayToPWLColor(pRuntime, aProp, &crProp); - color::ConvertArrayToPWLColor(pRuntime, arColor, &crColor); - + CFX_Color crProp = + color::ConvertArrayToPWLColor(pRuntime, vProp.ToArray(pRuntime)); + CFX_Color crColor = color::ConvertArrayToPWLColor(pRuntime, arColor); if (crColor != crProp) { - CJS_Value vProp2(pRuntime, arColor); - - fTarget->set_text_color(pRuntime, vProp2, &sError); + fTarget->set_text_color(pRuntime, CJS_Value(pRuntime, arColor), + &sError); } } } -- cgit v1.2.3