From 33d13f2231a07e7b32ff25da6a6a28cb619d18a9 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Mon, 23 Oct 2017 09:44:30 -0400
Subject: Remove CJS_PropValue

This CL removes the CJS_PropValue class and uses CJS_Value directly. The
various Set methods have been moved to CJS_Value and the runtime provided as
needed.

Change-Id: Ib5d3b9efc9b6cf8182be8f19af98599379c3d7db
Reviewed-on: https://pdfium-review.googlesource.com/16431
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 fpdfsdk/javascript/color.h | 68 ++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

(limited to 'fpdfsdk/javascript/color.h')

diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h
index d4ca43a878..08da346377 100644
--- a/fpdfsdk/javascript/color.h
+++ b/fpdfsdk/javascript/color.h
@@ -17,72 +17,58 @@ class color : public CJS_EmbedObj {
   explicit color(CJS_Object* pJSObject);
   ~color() override;
 
-  bool get_black(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
+  bool get_black(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_black(CJS_Runtime* pRuntime,
-                 const CJS_PropValue& vp,
+                 const CJS_Value& vp,
                  WideString* sError);
 
-  bool get_blue(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
-  bool set_blue(CJS_Runtime* pRuntime,
-                const CJS_PropValue& vp,
-                WideString* sError);
+  bool get_blue(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
+  bool set_blue(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError);
 
-  bool get_cyan(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
-  bool set_cyan(CJS_Runtime* pRuntime,
-                const CJS_PropValue& vp,
-                WideString* sError);
+  bool get_cyan(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
+  bool set_cyan(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError);
 
-  bool get_dark_gray(CJS_Runtime* pRuntime,
-                     CJS_PropValue* vp,
-                     WideString* sError);
+  bool get_dark_gray(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_dark_gray(CJS_Runtime* pRuntime,
-                     const CJS_PropValue& vp,
+                     const CJS_Value& vp,
                      WideString* sError);
 
-  bool get_gray(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
-  bool set_gray(CJS_Runtime* pRuntime,
-                const CJS_PropValue& vp,
-                WideString* sError);
+  bool get_gray(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
+  bool set_gray(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError);
 
-  bool get_green(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
+  bool get_green(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_green(CJS_Runtime* pRuntime,
-                 const CJS_PropValue& vp,
+                 const CJS_Value& vp,
                  WideString* sError);
 
-  bool get_light_gray(CJS_Runtime* pRuntime,
-                      CJS_PropValue* vp,
-                      WideString* sError);
+  bool get_light_gray(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_light_gray(CJS_Runtime* pRuntime,
-                      const CJS_PropValue& vp,
+                      const CJS_Value& vp,
                       WideString* sError);
 
-  bool get_magenta(CJS_Runtime* pRuntime,
-                   CJS_PropValue* vp,
-                   WideString* sError);
+  bool get_magenta(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_magenta(CJS_Runtime* pRuntime,
-                   const CJS_PropValue& vp,
+                   const CJS_Value& vp,
                    WideString* sError);
 
-  bool get_red(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
-  bool set_red(CJS_Runtime* pRuntime,
-               const CJS_PropValue& vp,
-               WideString* sError);
+  bool get_red(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
+  bool set_red(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError);
 
   bool get_transparent(CJS_Runtime* pRuntime,
-                       CJS_PropValue* vp,
+                       CJS_Value* vp,
                        WideString* sError);
   bool set_transparent(CJS_Runtime* pRuntime,
-                       const CJS_PropValue& vp,
+                       const CJS_Value& vp,
                        WideString* sError);
 
-  bool get_white(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
+  bool get_white(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_white(CJS_Runtime* pRuntime,
-                 const CJS_PropValue& vp,
+                 const CJS_Value& vp,
                  WideString* sError);
 
-  bool get_yellow(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError);
+  bool get_yellow(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError);
   bool set_yellow(CJS_Runtime* pRuntime,
-                  const CJS_PropValue& vp,
+                  const CJS_Value& vp,
                   WideString* sError);
 
   bool convert(CJS_Runtime* pRuntime,
@@ -102,11 +88,9 @@ class color : public CJS_EmbedObj {
                                      CFX_Color* color);
 
  private:
-  bool GetPropertyHelper(CJS_Runtime* pRuntime,
-                         CJS_PropValue* vp,
-                         CFX_Color* val);
+  bool GetPropertyHelper(CJS_Runtime* pRuntime, CJS_Value* vp, CFX_Color* val);
   bool SetPropertyHelper(CJS_Runtime* pRuntime,
-                         const CJS_PropValue& vp,
+                         const CJS_Value& vp,
                          CFX_Color* val);
 
   CFX_Color m_crTransparent;
-- 
cgit v1.2.3