From 7def3de1d026a7e99017113d0f17556a3130eba5 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 20 Aug 2018 23:17:06 +0000 Subject: Use UnownedPtr<> in CXFA_GEColor. Small size penalty in removing the union, but unions can lead to type errors. Change-Id: I8ff9fd63b1f87d05df18db17edbaf770226e1252 Reviewed-on: https://pdfium-review.googlesource.com/40790 Reviewed-by: Tom Sepez Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- xfa/fxgraphics/cxfa_gecolor.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fxgraphics/cxfa_gecolor.h') diff --git a/xfa/fxgraphics/cxfa_gecolor.h b/xfa/fxgraphics/cxfa_gecolor.h index b60585b7a4..2b2d2d4d07 100644 --- a/xfa/fxgraphics/cxfa_gecolor.h +++ b/xfa/fxgraphics/cxfa_gecolor.h @@ -7,6 +7,7 @@ #ifndef XFA_FXGRAPHICS_CXFA_GECOLOR_H_ #define XFA_FXGRAPHICS_CXFA_GECOLOR_H_ +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CXFA_GEPattern; @@ -20,6 +21,7 @@ class CXFA_GEColor { explicit CXFA_GEColor(const FX_ARGB argb); explicit CXFA_GEColor(CXFA_GEShading* shading); CXFA_GEColor(CXFA_GEPattern* pattern, const FX_ARGB argb); + CXFA_GEColor(const CXFA_GEColor& that); ~CXFA_GEColor(); Type GetType() const { return m_type; } @@ -29,22 +31,20 @@ class CXFA_GEColor { } CXFA_GEPattern* GetPattern() const { ASSERT(m_type == Pattern); - return m_pointer.pattern; + return m_pPattern.Get(); } CXFA_GEShading* GetShading() const { ASSERT(m_type == Shading); - return m_pointer.shading; + return m_pShading.Get(); } CXFA_GEColor& operator=(const CXFA_GEColor& that); private: - Type m_type; - FX_ARGB m_argb; - union { - CXFA_GEPattern* pattern; - CXFA_GEShading* shading; - } m_pointer; + Type m_type = Invalid; + FX_ARGB m_argb = 0; + UnownedPtr m_pPattern; + UnownedPtr m_pShading; }; #endif // XFA_FXGRAPHICS_CXFA_GECOLOR_H_ -- cgit v1.2.3