Merge to XFA: Use override in more classes in core/

core/include/fpdfapi/fpdf_pageobj.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 CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
 
 #include "../fxge/fx_ge.h"
@@ skipping 52 matching lines @@
                   FX_FLOAT right,
                   FX_FLOAT top) {
     m_pObject->AppendRect(left, bottom, right, top);
   }
 
   FX_BOOL IsRect() const { return m_pObject->IsRect(); }
 };
 class CPDF_ClipPathData {
  public:
   CPDF_ClipPathData();
-
   CPDF_ClipPathData(const CPDF_ClipPathData&);
-
   ~CPDF_ClipPathData();
 
   void SetCount(int path_count, int text_count);
 
  public:
   int m_PathCount;
 
   CPDF_Path* m_pPathList;
 
   uint8_t* m_pTypeList;
 
   int m_TextCount;
 
   CPDF_TextObject** m_pTextList;
 };
+
 class CPDF_ClipPath : public CFX_CountRef<CPDF_ClipPathData> {
  public:
   FX_DWORD GetPathCount() const { return m_pObject->m_PathCount; }
 
   CPDF_Path GetPath(int i) const { return m_pObject->m_pPathList[i]; }
 
   int GetClipType(int i) const { return m_pObject->m_pTypeList[i]; }
 
   FX_DWORD GetTextCount() const { return m_pObject->m_TextCount; }
 
@@ skipping 384 matching lines @@
   int m_nChars;
 
   FX_DWORD* m_pCharCodes;
 
   FX_FLOAT* m_pCharPos;
 };
 
 class CPDF_PathObject : public CPDF_PageObject {
  public:
   CPDF_PathObject() { m_Type = PDFPAGE_PATH; }
+  ~CPDF_PathObject() override {}
 
-  virtual ~CPDF_PathObject() {}
   void Transform(const CFX_AffineMatrix& maxtrix) override;
 
   void SetGraphState(CPDF_GraphState GraphState);
 
+  void CalcBoundingBox();
+
   CPDF_Path m_Path;
 
   int m_FillType;
 
   FX_BOOL m_bStroke;
 
   CFX_AffineMatrix m_Matrix;
 
-  void CalcBoundingBox();
-
  protected:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 class CPDF_ImageObject : public CPDF_PageObject {
  public:
   CPDF_ImageObject();
+  ~CPDF_ImageObject() override;
 
-  virtual ~CPDF_ImageObject();
   void Transform(const CFX_AffineMatrix& matrix) override;
 
   CPDF_Image* m_pImage;
 
   CFX_AffineMatrix m_Matrix;
 
   void CalcBoundingBox();
 
  private:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 class CPDF_ShadingObject : public CPDF_PageObject {
  public:
   CPDF_ShadingObject();
-
-  virtual ~CPDF_ShadingObject();
+  ~CPDF_ShadingObject() override;
 
   CPDF_ShadingPattern* m_pShading;
 
   CFX_AffineMatrix m_Matrix;
 
   void Transform(const CFX_AffineMatrix& matrix) override;
 
   void CalcBoundingBox();
 
  protected:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 class CPDF_FormObject : public CPDF_PageObject {
  public:
   CPDF_FormObject() {
     m_Type = PDFPAGE_FORM;
     m_pForm = NULL;
   }
+  ~CPDF_FormObject() override;
 
-  virtual ~CPDF_FormObject();
   void Transform(const CFX_AffineMatrix& matrix) override;
 
   CPDF_Form* m_pForm;
 
   CFX_AffineMatrix m_FormMatrix;
 
   void CalcBoundingBox();
 
  protected:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_