Cleanup IFDE_CSS interfaces.

xfa/fde/css/fde_cssdeclaration.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FDE_CSS_FDE_CSSDECLARATION_H_
 #define XFA_FDE_CSS_FDE_CSSDECLARATION_H_
 
 #include "xfa/fde/css/fde_cssdatatable.h"
@@ skipping 12 matching lines @@
   const FX_WCHAR* pwsValue;
   FDE_CSSCustomProperty* pNext;
 };
 
 struct FDE_CSSPROPERTYARGS {
   IFX_MEMAllocator* pStaticStore;
   CFX_MapPtrToPtr* pStringCache;
   FDE_LPCCSSPROPERTYTABLE pProperty;
 };
 
-class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target {
+class CFDE_CSSDeclaration : public CFX_Target {
  public:
   CFDE_CSSDeclaration()
-      : m_pFirstProperty(NULL),
-        m_pLastProperty(NULL),
-        m_pFirstCustom(NULL),
-        m_pLastCustom(NULL) {}
-  virtual IFDE_CSSValue* GetProperty(FDE_CSSPROPERTY eProperty,
-                                     FX_BOOL& bImportant) const;
-  virtual FX_POSITION GetStartPosition() const;
-  virtual void GetNextProperty(FX_POSITION& pos,
-                               FDE_CSSPROPERTY& eProperty,
-                               IFDE_CSSValue*& pValue,
-                               FX_BOOL& bImportant) const;
-  virtual FX_POSITION GetStartCustom() const;
-  virtual void GetNextCustom(FX_POSITION& pos,
-                             CFX_WideString& wsName,
-                             CFX_WideString& wsValue) const;
+      : m_pFirstProperty(nullptr),
+        m_pLastProperty(nullptr),
+        m_pFirstCustom(nullptr),
+        m_pLastCustom(nullptr) {}
+
+  IFDE_CSSValue* GetProperty(FDE_CSSPROPERTY eProperty,
+                             FX_BOOL& bImportant) const;
+  FX_POSITION GetStartPosition() const;
+  void GetNextProperty(FX_POSITION& pos,
+                       FDE_CSSPROPERTY& eProperty,
+                       IFDE_CSSValue*& pValue,
+                       FX_BOOL& bImportant) const;
+  FX_POSITION GetStartCustom() const;
+  void GetNextCustom(FX_POSITION& pos,
+                     CFX_WideString& wsName,
+                     CFX_WideString& wsValue) const;
   FX_BOOL AddProperty(const FDE_CSSPROPERTYARGS* pArgs,
                       const FX_WCHAR* pszValue,
                       int32_t iValueLen);
   FX_BOOL AddProperty(const FDE_CSSPROPERTYARGS* pArgs,
                       const FX_WCHAR* pszName,
                       int32_t iNameLen,
                       const FX_WCHAR* pszValue,
                       int32_t iValueLen);
 
  protected:
@@ skipping 81 matching lines @@
                               int32_t iValueLen);
   void AddPropertyHolder(IFX_MEMAllocator* pStaticStore,
                          FDE_CSSPROPERTY eProperty,
                          IFDE_CSSValue* pValue,
                          FX_BOOL bImportant);
   IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MEMAllocator* pStaticStore,
                                          FDE_CSSPRIMITIVETYPE eUnit,
                                          FX_FLOAT fValue) const;
   IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MEMAllocator* pStaticStore,
                                        FDE_CSSPROPERTYVALUE eValue) const;
+
   FDE_CSSPropertyHolder* m_pFirstProperty;
   FDE_CSSPropertyHolder* m_pLastProperty;
   FDE_CSSCustomProperty* m_pFirstCustom;
   FDE_CSSCustomProperty* m_pLastCustom;
 };
+typedef CFX_ArrayTemplate<CFDE_CSSDeclaration*> CFDE_CSSDeclarationArray;

[Tom Sepez, 2016/04/27 22:00:01]

nit: using 

[dsinclair, 2016/04/28 13:19:50]

Done.

 
 #endif  // XFA_FDE_CSS_FDE_CSSDECLARATION_H_