| Index: fpdfsdk/include/javascript/color.h
|
| diff --git a/fpdfsdk/include/javascript/color.h b/fpdfsdk/include/javascript/color.h
|
| index df863b552fcd27b5563c35bf44bf2bb3895f8fec..45704efa803cbba215c929292fa1b92b9ab1f84b 100644
|
| --- a/fpdfsdk/include/javascript/color.h
|
| +++ b/fpdfsdk/include/javascript/color.h
|
| @@ -10,71 +10,76 @@
|
| #include "JS_Define.h"
|
| // TODO(tsepez): include CPWL_Color.h once its own IWYU is fixed.
|
|
|
| -class color : public CJS_EmbedObj
|
| -{
|
| -public:
|
| - color(CJS_Object* pJSObject);
|
| - virtual ~color(void);
|
| +class color : public CJS_EmbedObj {
|
| + public:
|
| + color(CJS_Object* pJSObject);
|
| + virtual ~color(void);
|
|
|
| - FX_BOOL black(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL blue(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL cyan(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL dkGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL gray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL green(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL ltGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL magenta(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL red(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL transparent(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL white(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| - FX_BOOL yellow(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL black(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL blue(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL cyan(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL dkGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL gray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL green(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL ltGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL magenta(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL red(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL transparent(IFXJS_Context* cc,
|
| + CJS_PropValue& vp,
|
| + CFX_WideString& sError);
|
| + FX_BOOL white(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
| + FX_BOOL yellow(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
|
|
|
| - FX_BOOL convert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
|
| - FX_BOOL equal(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
|
| + FX_BOOL convert(IFXJS_Context* cc,
|
| + const CJS_Parameters& params,
|
| + CJS_Value& vRet,
|
| + CFX_WideString& sError);
|
| + FX_BOOL equal(IFXJS_Context* cc,
|
| + const CJS_Parameters& params,
|
| + CJS_Value& vRet,
|
| + CFX_WideString& sError);
|
|
|
| -public:
|
| - static void ConvertPWLColorToArray(const CPWL_Color& color, CJS_Array& array);
|
| - static void ConvertArrayToPWLColor(CJS_Array& array, CPWL_Color& color);
|
| + 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;
|
| - CPWL_Color m_crGreen;
|
| - CPWL_Color m_crBlue;
|
| - CPWL_Color m_crCyan;
|
| - CPWL_Color m_crMagenta;
|
| - CPWL_Color m_crYellow;
|
| - CPWL_Color m_crDKGray;
|
| - CPWL_Color m_crGray;
|
| - CPWL_Color m_crLTGray;
|
| + private:
|
| + CPWL_Color m_crTransparent;
|
| + CPWL_Color m_crBlack;
|
| + CPWL_Color m_crWhite;
|
| + CPWL_Color m_crRed;
|
| + CPWL_Color m_crGreen;
|
| + CPWL_Color m_crBlue;
|
| + CPWL_Color m_crCyan;
|
| + CPWL_Color m_crMagenta;
|
| + CPWL_Color m_crYellow;
|
| + CPWL_Color m_crDKGray;
|
| + CPWL_Color m_crGray;
|
| + CPWL_Color m_crLTGray;
|
| };
|
|
|
| -class CJS_Color : public CJS_Object
|
| -{
|
| -public:
|
| - CJS_Color(JSFXObject pObject) : CJS_Object(pObject) {};
|
| - virtual ~CJS_Color(void){};
|
| +class CJS_Color : public CJS_Object {
|
| + public:
|
| + CJS_Color(JSFXObject pObject) : CJS_Object(pObject){};
|
| + virtual ~CJS_Color(void){};
|
|
|
| - DECLARE_JS_CLASS(CJS_Color);
|
| + DECLARE_JS_CLASS(CJS_Color);
|
|
|
| - JS_STATIC_PROP(black, color);
|
| - JS_STATIC_PROP(blue, color);
|
| - JS_STATIC_PROP(cyan, color);
|
| - JS_STATIC_PROP(dkGray, color);
|
| - JS_STATIC_PROP(gray, color);
|
| - JS_STATIC_PROP(green, color);
|
| - JS_STATIC_PROP(ltGray, color);
|
| - JS_STATIC_PROP(magenta, color);
|
| - JS_STATIC_PROP(red, color);
|
| - JS_STATIC_PROP(transparent, color);
|
| - JS_STATIC_PROP(white, color);
|
| - JS_STATIC_PROP(yellow, color);
|
| -
|
| - JS_STATIC_METHOD(convert,color);
|
| - JS_STATIC_METHOD(equal,color);
|
| + JS_STATIC_PROP(black, color);
|
| + JS_STATIC_PROP(blue, color);
|
| + JS_STATIC_PROP(cyan, color);
|
| + JS_STATIC_PROP(dkGray, color);
|
| + JS_STATIC_PROP(gray, color);
|
| + JS_STATIC_PROP(green, color);
|
| + JS_STATIC_PROP(ltGray, color);
|
| + JS_STATIC_PROP(magenta, color);
|
| + JS_STATIC_PROP(red, color);
|
| + JS_STATIC_PROP(transparent, color);
|
| + JS_STATIC_PROP(white, color);
|
| + JS_STATIC_PROP(yellow, color);
|
|
|
| + JS_STATIC_METHOD(convert, color);
|
| + JS_STATIC_METHOD(equal, color);
|
| };
|
|
|
| #endif // FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
|
|
|