summaryrefslogtreecommitdiff
path: root/xfa/fxgraphics
diff options
context:
space:
mode:
authorweili <weili@chromium.org>2016-08-22 13:37:04 -0700
committerCommit bot <commit-bot@chromium.org>2016-08-22 13:37:04 -0700
commit9b99ebf5159d98cc83fb2e8ebac6750e158841d6 (patch)
treefd8fa25abf4be216e50d62dfce8cfc694efc3a97 /xfa/fxgraphics
parent28a4a2410f24910c709578d981cae3bb8153fdba (diff)
downloadpdfium-9b99ebf5159d98cc83fb2e8ebac6750e158841d6.tar.xz
Make CFX_Color constructor explicit
Change the places which require implicit construction, and make the construction from ARGB_Color explicit. Review-Url: https://codereview.chromium.org/2263923003
Diffstat (limited to 'xfa/fxgraphics')
-rw-r--r--xfa/fxgraphics/cfx_color.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cfx_color.h
index bf61c6859a..0f321764f9 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: