Make code compile with clang_use_chrome_plugin (final)

xfa/fde/xml/fde_xml_imp.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_XML_FDE_XML_IMP_H_
 #define XFA_FDE_XML_FDE_XML_IMP_H_
 
 #include "core/fxcrt/include/fx_system.h"
@@ skipping 22 matching lines @@
     LastSibling,
     FirstNeighbor,
     PriorNeighbor,
     NextNeighbor,
     LastNeighbor,
     FirstChild,
     LastChild
   };
 
   CFDE_XMLNode();
-  virtual ~CFDE_XMLNode();
+  ~CFDE_XMLNode() override;
 
-  virtual void Release() { delete this; }
-  virtual FDE_XMLNODETYPE GetType() const { return FDE_XMLNODE_Unknown; }
+  virtual void Release();
+  virtual FDE_XMLNODETYPE GetType() const;
+  virtual int32_t CountChildNodes() const;
+  virtual CFDE_XMLNode* GetChildNode(int32_t index) const;
+  virtual int32_t GetChildNodeIndex(CFDE_XMLNode* pNode) const;

[Lei Zhang, 2016/06/17 03:10:05]

Why are these virtual now?

[Wei Li, 2016/06/17 21:47:45]

Rebase madness :(
Thanks for spotting this.

+  virtual CFDE_XMLNode* GetPath(const FX_WCHAR* pPath,
+                                int32_t iLength = -1,
+                                FX_BOOL bQualifiedName = TRUE) const;
+  virtual int32_t InsertChildNode(CFDE_XMLNode* pNode, int32_t index = -1);
+  virtual void RemoveChildNode(CFDE_XMLNode* pNode);
+  virtual void DeleteChildren();
+  virtual CFDE_XMLNode* GetNodeItem(CFDE_XMLNode::NodeItem eItem) const;
+  virtual int32_t GetNodeLevel() const;
+  virtual FX_BOOL InsertNodeItem(CFDE_XMLNode::NodeItem eItem,
+                                 CFDE_XMLNode* pNode);
+  virtual CFDE_XMLNode* RemoveNodeItem(CFDE_XMLNode::NodeItem eItem);
   virtual CFDE_XMLNode* Clone(FX_BOOL bRecursive);
 
-  int32_t CountChildNodes() const;
-  CFDE_XMLNode* GetChildNode(int32_t index) const;
-  int32_t GetChildNodeIndex(CFDE_XMLNode* pNode) const;
-  int32_t InsertChildNode(CFDE_XMLNode* pNode, int32_t index = -1);
-  void RemoveChildNode(CFDE_XMLNode* pNode);
-  void DeleteChildren();
   void CloneChildren(CFDE_XMLNode* pClone);
-
-  CFDE_XMLNode* GetPath(const FX_WCHAR* pPath,
-                        int32_t iLength = -1,
-                        FX_BOOL bQualifiedName = TRUE) const;
-
-  int32_t GetNodeLevel() const;
-  CFDE_XMLNode* GetNodeItem(CFDE_XMLNode::NodeItem eItem) const;
-  FX_BOOL InsertNodeItem(CFDE_XMLNode::NodeItem eItem, CFDE_XMLNode* pNode);
-  CFDE_XMLNode* RemoveNodeItem(CFDE_XMLNode::NodeItem eItem);
-
   void SaveXMLNode(IFX_Stream* pXMLStream);
 
   CFDE_XMLNode* m_pParent;
   CFDE_XMLNode* m_pChild;
   CFDE_XMLNode* m_pPrior;
   CFDE_XMLNode* m_pNext;
 };
 
 class CFDE_XMLInstruction : public CFDE_XMLNode {
  public:
   CFDE_XMLInstruction(const CFX_WideString& wsTarget);
-  ~CFDE_XMLInstruction() override {}
+  ~CFDE_XMLInstruction() override;
 
   // CFDE_XMLNode
-  void Release() override { delete this; }
-  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_Instruction; }
+  void Release() override;
+  FDE_XMLNODETYPE GetType() const override;
   CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
 
-  void GetTargetName(CFX_WideString& wsTarget) const { wsTarget = m_wsTarget; }
-  int32_t CountAttributes() const;
-  FX_BOOL GetAttribute(int32_t index,
-                       CFX_WideString& wsAttriName,
-                       CFX_WideString& wsAttriValue) const;
-  FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
-  void GetString(const FX_WCHAR* pwsAttriName,
-                 CFX_WideString& wsAttriValue,
-                 const FX_WCHAR* pwsDefValue = nullptr) const;
-  void SetString(const CFX_WideString& wsAttriName,
-                 const CFX_WideString& wsAttriValue);
-  int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const;
-  void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
-  FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const;
-  void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
-  void RemoveAttribute(const FX_WCHAR* pwsAttriName);
-  int32_t CountData() const;
-  FX_BOOL GetData(int32_t index, CFX_WideString& wsData) const;
-  void AppendData(const CFX_WideString& wsData);
-  void RemoveData(int32_t index);
+  virtual void GetTargetName(CFX_WideString& wsTarget) const;

[Lei Zhang, 2016/06/17 03:10:05]

Ditto

[Wei Li, 2016/06/17 21:47:45]

Done.

+  virtual int32_t CountAttributes() const;
+  virtual FX_BOOL GetAttribute(int32_t index,
+                               CFX_WideString& wsAttriName,
+                               CFX_WideString& wsAttriValue) const;
+  virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
+  virtual void GetString(const FX_WCHAR* pwsAttriName,
+                         CFX_WideString& wsAttriValue,
+                         const FX_WCHAR* pwsDefValue = nullptr) const;
+  virtual void SetString(const CFX_WideString& wsAttriName,
+                         const CFX_WideString& wsAttriValue);
+  virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName,
+                             int32_t iDefValue = 0) const;
+  virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
+  virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName,
+                            FX_FLOAT fDefValue = 0) const;
+  virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
+  virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName);
+  virtual int32_t CountData() const;
+  virtual FX_BOOL GetData(int32_t index, CFX_WideString& wsData) const;
+  virtual void AppendData(const CFX_WideString& wsData);
+  virtual void RemoveData(int32_t index);
 
   CFX_WideString m_wsTarget;
   CFX_WideStringArray m_Attributes;
   CFX_WideStringArray m_TargetData;
 };
 
 class CFDE_XMLElement : public CFDE_XMLNode {
  public:
   CFDE_XMLElement(const CFX_WideString& wsTag);
   ~CFDE_XMLElement() override;
 
   // CFDE_XMLNode
-  void Release() override { delete this; }
-  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_Element; }
+  void Release() override;
+  FDE_XMLNODETYPE GetType() const override;
   CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
 
-  void GetTagName(CFX_WideString& wsTag) const;
-  void GetLocalTagName(CFX_WideString& wsTag) const;
-
-  void GetNamespacePrefix(CFX_WideString& wsPrefix) const;
-  void GetNamespaceURI(CFX_WideString& wsNamespace) const;
-
-  int32_t CountAttributes() const;
-  FX_BOOL GetAttribute(int32_t index,
-                       CFX_WideString& wsAttriName,
-                       CFX_WideString& wsAttriValue) const;
-  FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
-  void RemoveAttribute(const FX_WCHAR* pwsAttriName);
-
-  void GetString(const FX_WCHAR* pwsAttriName,
-                 CFX_WideString& wsAttriValue,
-                 const FX_WCHAR* pwsDefValue = nullptr) const;
-  void SetString(const CFX_WideString& wsAttriName,
-                 const CFX_WideString& wsAttriValue);
-
-  int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const;
-  void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
-
-  FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const;
-  void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
-
-  void GetTextData(CFX_WideString& wsText) const;
-  void SetTextData(const CFX_WideString& wsText);
+  virtual void GetTagName(CFX_WideString& wsTag) const;

[Lei Zhang, 2016/06/17 03:10:05]

Ditto ditto, and more below.

[Wei Li, 2016/06/17 21:47:45]

Done.

+  virtual void GetLocalTagName(CFX_WideString& wsTag) const;
+  virtual void GetNamespacePrefix(CFX_WideString& wsPrefix) const;
+  virtual void GetNamespaceURI(CFX_WideString& wsNamespace) const;
+  virtual int32_t CountAttributes() const;
+  virtual FX_BOOL GetAttribute(int32_t index,
+                               CFX_WideString& wsAttriName,
+                               CFX_WideString& wsAttriValue) const;
+  virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
+  virtual void GetString(const FX_WCHAR* pwsAttriName,
+                         CFX_WideString& wsAttriValue,
+                         const FX_WCHAR* pwsDefValue = nullptr) const;
+  virtual void SetString(const CFX_WideString& wsAttriName,
+                         const CFX_WideString& wsAttriValue);
+  virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName,
+                             int32_t iDefValue = 0) const;
+  virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
+  virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName,
+                            FX_FLOAT fDefValue = 0) const;
+  virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
+  virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName);
+  virtual void GetTextData(CFX_WideString& wsText) const;
+  virtual void SetTextData(const CFX_WideString& wsText);
 
   CFX_WideString m_wsTag;
   CFX_WideStringArray m_Attributes;
 };
 
 class CFDE_XMLText : public CFDE_XMLNode {
  public:
   CFDE_XMLText(const CFX_WideString& wsText);
-  ~CFDE_XMLText() override {}
+  ~CFDE_XMLText() override;
 
   // CFDE_XMLNode
-  void Release() override { delete this; }
-  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_Text; }
+  void Release() override;
+  FDE_XMLNODETYPE GetType() const override;
   CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
 
-  void GetText(CFX_WideString& wsText) const { wsText = m_wsText; }
-  void SetText(const CFX_WideString& wsText) { m_wsText = wsText; }
+  virtual void GetText(CFX_WideString& wsText) const;
+  virtual void SetText(const CFX_WideString& wsText);
 
   CFX_WideString m_wsText;
 };
 
 class CFDE_XMLDeclaration : public CFDE_XMLNode {
  public:
   CFDE_XMLDeclaration() : CFDE_XMLNode() {}
   ~CFDE_XMLDeclaration() override {}
 };
 
 class CFDE_XMLCharData : public CFDE_XMLDeclaration {
  public:
   CFDE_XMLCharData(const CFX_WideString& wsCData);
-  ~CFDE_XMLCharData() override {}
+  ~CFDE_XMLCharData() override;
 
-  void Release() override { delete this; }
-  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_CharData; }
+  // CFDE_XMLNode
+  void Release() override;
+  FDE_XMLNODETYPE GetType() const override;
   CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
 
-  void GetCharData(CFX_WideString& wsCharData) const {
-    wsCharData = m_wsCharData;
-  }
-  void SetCharData(const CFX_WideString& wsCData) { m_wsCharData = wsCData; }
+  virtual void GetCharData(CFX_WideString& wsCharData) const;
+  virtual void SetCharData(const CFX_WideString& wsCData);
 
   CFX_WideString m_wsCharData;
 };
 
 class CFDE_XMLDoc : public CFX_Target {
  public:
   CFDE_XMLDoc();
   ~CFDE_XMLDoc() override;
 
-  void Release() { delete this; }
-  FX_BOOL LoadXML(CFDE_XMLParser* pXMLParser);
-  int32_t DoLoad(IFX_Pause* pPause = nullptr);
-  void CloseXML();
-  CFDE_XMLNode* GetRoot() const { return m_pRoot; }
-  void SaveXML(IFX_Stream* pXMLStream = nullptr, FX_BOOL bSaveBOM = TRUE);
-  void SaveXMLNode(IFX_Stream* pXMLStream, CFDE_XMLNode* pNode);
+  virtual void Release();
+  virtual FX_BOOL LoadXML(CFDE_XMLParser* pXMLParser);
+  virtual int32_t DoLoad(IFX_Pause* pPause = nullptr);
+  virtual void CloseXML();
+  virtual CFDE_XMLNode* GetRoot() const;
+  virtual void SaveXML(IFX_Stream* pXMLStream = NULL, FX_BOOL bSaveBOM = TRUE);

[Lei Zhang, 2016/06/17 03:10:05]

nullptr

[Wei Li, 2016/06/17 21:47:45]

Done.

+  virtual void SaveXMLNode(IFX_Stream* pXMLStream, CFDE_XMLNode* pNode);
 
  protected:
   void Reset(FX_BOOL bInitRoot);
   void ReleaseParser();
 
   IFX_Stream* m_pStream;
   int32_t m_iStatus;
   CFDE_XMLNode* m_pRoot;
   CFDE_XMLSyntaxParser* m_pSyntaxParser;
   CFDE_XMLParser* m_pXMLParser;
 };
 
 class CFDE_XMLParser {
  public:
   virtual ~CFDE_XMLParser() {}
 
   virtual void Release() = 0;
   virtual int32_t DoParser(IFX_Pause* pPause) = 0;
 };
 
 class CFDE_BlockBuffer : public CFX_Target {
  public:
   CFDE_BlockBuffer(int32_t iAllocStep = 1024 * 1024);
-  ~CFDE_BlockBuffer();
+  ~CFDE_BlockBuffer() override;
 
   FX_BOOL InitBuffer(int32_t iBufferSize = 1024 * 1024);
   FX_BOOL IsInitialized() { return m_iBufferSize / m_iAllocStep >= 1; }
   void ReleaseBuffer() { delete this; }
   FX_WCHAR* GetAvailableBlock(int32_t& iIndexInBlock);
   inline int32_t GetAllocStep() const { return m_iAllocStep; }
   inline int32_t& GetDataLengthRef() { return m_iDataLength; }
   inline void Reset(FX_BOOL bReserveData = TRUE) {
     if (!bReserveData) {
       m_iStartPosition = 0;
@@ skipping 15 matching lines @@
   CFX_ArrayTemplate<FX_WCHAR*> m_BlockArray;
   int32_t m_iDataLength;
   int32_t m_iBufferSize;
   int32_t m_iAllocStep;
   int32_t m_iStartPosition;
 };
 
 class CFDE_XMLSyntaxParser : public CFX_Target {
  public:
   CFDE_XMLSyntaxParser();
-  ~CFDE_XMLSyntaxParser();
+  ~CFDE_XMLSyntaxParser() override;
 
   void Release() { delete this; }
   void Init(IFX_Stream* pStream,
             int32_t iXMLPlaneSize,
             int32_t iTextDataSize = 256);
 
   FDE_XmlSyntaxResult DoSyntaxParse();
 
   int32_t GetStatus() const;
   int32_t GetCurrentPos() const {
@@ skipping 70 matching lines @@
   int32_t m_iTextDataLength;
   FDE_XmlSyntaxResult m_syntaxParserResult;
   FDE_XmlSyntaxState m_syntaxParserState;
   FX_WCHAR m_wQuotationMark;
   int32_t m_iEntityStart;
   CFX_DWordStack m_SkipStack;
   FX_WCHAR m_SkipChar;
 };
 
 #endif  // XFA_FDE_XML_FDE_XML_IMP_H_