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/color.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/javascript/color.h') diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h index 08da346377..851f05b124 100644 --- a/fpdfsdk/javascript/color.h +++ b/fpdfsdk/javascript/color.h @@ -14,6 +14,11 @@ class color : public CJS_EmbedObj { public: + static CJS_Array ConvertPWLColorToArray(CJS_Runtime* pRuntime, + const CFX_Color& color); + static CFX_Color ConvertArrayToPWLColor(CJS_Runtime* pRuntime, + const CJS_Array& array); + explicit color(CJS_Object* pJSObject); ~color() override; @@ -80,13 +85,6 @@ class color : public CJS_EmbedObj { CJS_Value& vRet, WideString& sError); - static void ConvertPWLColorToArray(CJS_Runtime* pRuntime, - const CFX_Color& color, - CJS_Array* array); - static void ConvertArrayToPWLColor(CJS_Runtime* pRuntime, - const CJS_Array& array, - CFX_Color* color); - private: bool GetPropertyHelper(CJS_Runtime* pRuntime, CJS_Value* vp, CFX_Color* val); bool SetPropertyHelper(CJS_Runtime* pRuntime, -- cgit v1.2.3