| Index: xfa/fxgraphics/cfx_color.h
|
| diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cfx_color.h
|
| index bf61c6859a018ca1f4e46ebcfbc9e204886e85fe..0f321764f92be6bc636afe14fc6710c7a1b24149 100644
|
| --- a/xfa/fxgraphics/cfx_color.h
|
| +++ b/xfa/fxgraphics/cfx_color.h
|
| @@ -18,15 +18,13 @@ enum { FX_COLOR_None = 0, FX_COLOR_Solid, FX_COLOR_Pattern, FX_COLOR_Shading };
|
| class CFX_Color {
|
| public:
|
| CFX_Color();
|
| - // TODO(weili): Remove implicit conversions. Make this explicit.
|
| - CFX_Color(const FX_ARGB argb);
|
| -
|
| - explicit CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb = 0x0);
|
| + explicit CFX_Color(const FX_ARGB argb);
|
| explicit CFX_Color(CFX_Shading* shading);
|
| + CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb);
|
| virtual ~CFX_Color();
|
|
|
| FWL_Error Set(const FX_ARGB argb);
|
| - FWL_Error Set(CFX_Pattern* pattern, const FX_ARGB argb = 0x0);
|
| + FWL_Error Set(CFX_Pattern* pattern, const FX_ARGB argb);
|
| FWL_Error Set(CFX_Shading* shading);
|
|
|
| private:
|
|
|