Tidy up JS_Defines.h

fpdfsdk/include/javascript/color.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _COLOR_H_
 #define _COLOR_H_
 
 class color : public CJS_EmbedObj
 {
 public:
         color(CJS_Object* pJSObject);
         virtual ~color(void);
 
-        FX_BOOL black(OBJ_PROP_PARAMS);
-        FX_BOOL blue(OBJ_PROP_PARAMS);
-        FX_BOOL cyan(OBJ_PROP_PARAMS);  
-        FX_BOOL dkGray(OBJ_PROP_PARAMS);
-        FX_BOOL gray(OBJ_PROP_PARAMS);
-        FX_BOOL green(OBJ_PROP_PARAMS);
-        FX_BOOL ltGray(OBJ_PROP_PARAMS);
-        FX_BOOL magenta(OBJ_PROP_PARAMS);
-        FX_BOOL red(OBJ_PROP_PARAMS);   
-        FX_BOOL transparent(OBJ_PROP_PARAMS);
-        FX_BOOL white(OBJ_PROP_PARAMS);
-        FX_BOOL yellow(OBJ_PROP_PARAMS);
+        FX_BOOL black(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL blue(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL cyan(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);     
+        FX_BOOL dkGray(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL gray(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL green(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL ltGray(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL magenta(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL red(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);      
+        FX_BOOL transparent(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL white(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+        FX_BOOL yellow(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
 
-        FX_BOOL convert(OBJ_METHOD_PARAMS);
-        FX_BOOL equal(OBJ_METHOD_PARAMS);
+        FX_BOOL convert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+        FX_BOOL equal(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
 
 public:  
         static void             ConvertPWLColorToArray(const CPWL_Color& color, CJS_Array& array);
         static void             ConvertArrayToPWLColor(CJS_Array& array, CPWL_Color& color);
 
 private:
         CPWL_Color              m_crTransparent;
         CPWL_Color              m_crBlack;
         CPWL_Color              m_crWhite;
         CPWL_Color              m_crRed;
@@ skipping 28 matching lines @@
         JS_STATIC_PROP(white, color);
         JS_STATIC_PROP(yellow, color);
 
         JS_STATIC_METHOD(convert,color);
         JS_STATIC_METHOD(equal,color);
 
 };
 
 #endif //_COLOR_H_