diff options
author | Lei Zhang <thestig@chromium.org> | 2015-08-14 14:07:43 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 14:07:43 -0700 |
commit | c2c3f7b5f0396409451a9d344f35ec1929a76e9f (patch) | |
tree | b1c696afdca13e8087e18014b19a6c82415f72d5 /core/include/fpdfapi/fpdf_pageobj.h | |
parent | c6540e037ed1a9546d5a90455bf440a24b181ab4 (diff) | |
download | pdfium-c2c3f7b5f0396409451a9d344f35ec1929a76e9f.tar.xz |
Use override in more classes in core/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1292613003 .
Diffstat (limited to 'core/include/fpdfapi/fpdf_pageobj.h')
-rw-r--r-- | core/include/fpdfapi/fpdf_pageobj.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h index be81244ef4..7ea51cc814 100644 --- a/core/include/fpdfapi/fpdf_pageobj.h +++ b/core/include/fpdfapi/fpdf_pageobj.h @@ -70,9 +70,7 @@ class CPDF_Path : public CFX_CountRef<CFX_PathData> { class CPDF_ClipPathData { public: CPDF_ClipPathData(); - CPDF_ClipPathData(const CPDF_ClipPathData&); - ~CPDF_ClipPathData(); void SetCount(int path_count, int text_count); @@ -88,6 +86,7 @@ class CPDF_ClipPathData { CPDF_TextObject** m_pTextList; }; + class CPDF_ClipPath : public CFX_CountRef<CPDF_ClipPathData> { public: FX_DWORD GetPathCount() const { return m_pObject->m_PathCount; } @@ -492,12 +491,14 @@ class CPDF_TextObject : public CPDF_PageObject { 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; @@ -506,8 +507,6 @@ class CPDF_PathObject : public CPDF_PageObject { CFX_AffineMatrix m_Matrix; - void CalcBoundingBox(); - protected: void CopyData(const CPDF_PageObject* pSrcObject) override; }; @@ -515,8 +514,8 @@ class CPDF_PathObject : public CPDF_PageObject { 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; @@ -532,8 +531,7 @@ class CPDF_ImageObject : public CPDF_PageObject { class CPDF_ShadingObject : public CPDF_PageObject { public: CPDF_ShadingObject(); - - virtual ~CPDF_ShadingObject(); + ~CPDF_ShadingObject() override; CPDF_ShadingPattern* m_pShading; @@ -553,8 +551,8 @@ class CPDF_FormObject : public CPDF_PageObject { m_Type = PDFPAGE_FORM; m_pForm = NULL; } + ~CPDF_FormObject() override; - virtual ~CPDF_FormObject(); void Transform(const CFX_AffineMatrix& matrix) override; CPDF_Form* m_pForm; |