Tidy up JS_Defines.h

fpdfsdk/src/javascript/color.cpp

 // 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
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 138 matching lines @@
         {
                 color = CPWL_Color(COLORTYPE_RGB, (FX_FLOAT)d1, (FX_FLOAT)d2, (FX_FLOAT)d3);
         }
         else if (sSpace == "CMYK")
         {
                 color = CPWL_Color(COLORTYPE_CMYK, (FX_FLOAT)d1, (FX_FLOAT)d2, (FX_FLOAT)d3, (FX_FLOAT)d4);
         }
 }
 
 #define JS_IMPLEMENT_COLORPROP(prop, var)\
-FX_BOOL color::prop(OBJ_PROP_PARAMS)\
+FX_BOOL color::prop(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError)\
 {\
         CJS_Context* pContext = (CJS_Context*)cc;\
         v8::Isolate* isolate = pContext->GetJSRuntime()->GetIsolate();\
         if (vp.IsGetting())\
         {\
                 CJS_Array array(isolate);\
                 ConvertPWLColorToArray(var, array);\
                 vp << array;\
         }\
         else\
@@ skipping 11 matching lines @@
 JS_IMPLEMENT_COLORPROP(red, m_crRed)
 JS_IMPLEMENT_COLORPROP(green, m_crGreen)
 JS_IMPLEMENT_COLORPROP(blue, m_crBlue)
 JS_IMPLEMENT_COLORPROP(cyan, m_crCyan)
 JS_IMPLEMENT_COLORPROP(magenta, m_crMagenta)
 JS_IMPLEMENT_COLORPROP(yellow, m_crYellow)
 JS_IMPLEMENT_COLORPROP(dkGray, m_crDKGray)
 JS_IMPLEMENT_COLORPROP(gray, m_crGray)
 JS_IMPLEMENT_COLORPROP(ltGray, m_crLTGray)
 
-FX_BOOL color::convert(OBJ_METHOD_PARAMS)
+FX_BOOL color::convert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
         int iSize = params.size();
         if (iSize < 2) return FALSE;
         CJS_Array aSource(isolate);
         if (!params[0].ConvertToArray(aSource)) return FALSE;
 
         CPWL_Color crSource;
         ConvertArrayToPWLColor(aSource, crSource);
 
@@ skipping 20 matching lines @@
 
         CJS_Array aDest(isolate);
         CPWL_Color crDest = crSource;
         crDest.ConvertColorType(nColorType);
         ConvertPWLColorToArray(crDest, aDest);
         vRet = aDest;
 
         return TRUE;
 }
 
-FX_BOOL color::equal(OBJ_METHOD_PARAMS)
+FX_BOOL color::equal(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
         if (params.size() < 2) return FALSE;
 
         CJS_Array array1(isolate), array2(isolate);
 
         if (!params[0].ConvertToArray(array1)) return FALSE;
         if (!params[1].ConvertToArray(array2)) return FALSE;
 
         CPWL_Color color1;
         CPWL_Color color2;
 
         ConvertArrayToPWLColor(array1, color1);
         ConvertArrayToPWLColor(array2, color2);
 
         color1.ConvertColorType(color2.nColorType);
 
         vRet = color1 == color2;
         return TRUE;
 }