From 6efd0d7464e1f02ef3cd4f1abe5c6f8e5283fbbb Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 16 Jan 2017 16:05:17 -0500 Subject: Replace remaining CSS interfaces with concrete classes This Cl moves IFDE_CSSValue and IFDE_CSSRule to concrete classes and moves the holding of the type into the base class. Change-Id: Iea29cc55256dd2183b60ca8711367d5dc8daaa24 Reviewed-on: https://pdfium-review.googlesource.com/2178 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fde/css/fde_cssdeclaration.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'xfa/fde/css/fde_cssdeclaration.h') diff --git a/xfa/fde/css/fde_cssdeclaration.h b/xfa/fde/css/fde_cssdeclaration.h index 8db6d7b6a1..2dbd7a0622 100644 --- a/xfa/fde/css/fde_cssdeclaration.h +++ b/xfa/fde/css/fde_cssdeclaration.h @@ -15,7 +15,7 @@ class FDE_CSSPropertyHolder { public: FDE_CSSProperty eProperty; bool bImportant; - IFDE_CSSValue* pValue; + CFDE_CSSValue* pValue; FDE_CSSPropertyHolder* pNext; }; @@ -39,11 +39,11 @@ class CFDE_CSSDeclaration { m_pFirstCustom(nullptr), m_pLastCustom(nullptr) {} - IFDE_CSSValue* GetProperty(FDE_CSSProperty eProperty, bool& bImportant) const; + CFDE_CSSValue* GetProperty(FDE_CSSProperty eProperty, bool& bImportant) const; FX_POSITION GetStartPosition() const; void GetNextProperty(FX_POSITION& pos, FDE_CSSProperty& eProperty, - IFDE_CSSValue*& pValue, + CFDE_CSSValue*& pValue, bool& bImportant) const; FX_POSITION GetStartCustom() const; void GetNextCustom(FX_POSITION& pos, @@ -65,40 +65,40 @@ class CFDE_CSSDeclaration { bool bImportant); bool ParseBorderProperty(const FX_WCHAR* pszValue, int32_t iValueLen, - IFDE_CSSValue*& pWidth) const; + CFDE_CSSValue*& pWidth) const; bool ParseValueListProperty(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, bool bImportant); - bool Add4ValuesProperty(const CFDE_CSSValueArray& list, + bool Add4ValuesProperty(const CFX_ArrayTemplate& list, bool bImportant, FDE_CSSProperty eLeft, FDE_CSSProperty eTop, FDE_CSSProperty eRight, FDE_CSSProperty eBottom); - IFDE_CSSValue* ParseNumber(const FDE_CSSPropertyArgs* pArgs, + CFDE_CSSValue* ParseNumber(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseEnum(const FDE_CSSPropertyArgs* pArgs, + CFDE_CSSValue* ParseEnum(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseColor(const FDE_CSSPropertyArgs* pArgs, + CFDE_CSSValue* ParseColor(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseURI(const FDE_CSSPropertyArgs* pArgs, + CFDE_CSSValue* ParseURI(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseString(const FDE_CSSPropertyArgs* pArgs, + CFDE_CSSValue* ParseString(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseFunction(const FDE_CSSPropertyArgs* pArgs, + CFDE_CSSValue* ParseFunction(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); const FX_WCHAR* CopyToLocal(const FDE_CSSPropertyArgs* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); void AddPropertyHolder(FDE_CSSProperty eProperty, - IFDE_CSSValue* pValue, + CFDE_CSSValue* pValue, bool bImportant); CFDE_CSSPrimitiveValue* NewNumberValue(FDE_CSSPrimitiveType eUnit, FX_FLOAT fValue) const; -- cgit v1.2.3