summaryrefslogtreecommitdiff
path: root/xfa/src/fdp/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-06-19 14:58:28 -0700
committerLei Zhang <thestig@chromium.org>2015-06-19 14:58:28 -0700
commit568aff520b4ca33d851317a4ea88807b4fd2da40 (patch)
tree02c6409057908381d36efcd556dd8082044d5509 /xfa/src/fdp/include
parentc49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec (diff)
downloadpdfium-568aff520b4ca33d851317a4ea88807b4fd2da40.tar.xz
Fix -Wnon-virtual-dtor warnings on the XFA branch.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1183483003.
Diffstat (limited to 'xfa/src/fdp/include')
-rw-r--r--xfa/src/fdp/include/fde_brs.h1
-rw-r--r--xfa/src/fdp/include/fde_css.h20
-rw-r--r--xfa/src/fdp/include/fde_img.h1
-rw-r--r--xfa/src/fdp/include/fde_pen.h2
-rw-r--r--xfa/src/fdp/include/fde_psr.h2
-rw-r--r--xfa/src/fdp/include/fde_pth.h1
-rw-r--r--xfa/src/fdp/include/fde_rdr.h4
-rw-r--r--xfa/src/fdp/include/fde_rdv.h4
-rw-r--r--xfa/src/fdp/include/fde_tto.h2
-rw-r--r--xfa/src/fdp/include/fde_xml.h6
10 files changed, 41 insertions, 2 deletions
diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h
index dacf31fd2a..d310c55749 100644
--- a/xfa/src/fdp/include/fde_brs.h
+++ b/xfa/src/fdp/include/fde_brs.h
@@ -34,6 +34,7 @@ class IFDE_Brush
{
public:
static IFDE_Brush* Create(int32_t iType);
+ virtual ~IFDE_Brush() {}
virtual void Release() = 0;
virtual int32_t GetType() const = 0;
};
diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h
index 96d49250b9..ad8ffc01a5 100644
--- a/xfa/src/fdp/include/fde_css.h
+++ b/xfa/src/fdp/include/fde_css.h
@@ -230,6 +230,7 @@ enum FDE_CSSPROPERTYVALUE {
class IFDE_CSSValue
{
public:
+ virtual ~IFDE_CSSValue() {}
virtual FDE_CSSVALUETYPE GetType() const = 0;
};
class IFDE_CSSPrimitiveValue : public IFDE_CSSValue
@@ -375,6 +376,7 @@ enum FDE_CSSPROPERTY {
class IFDE_CSSDeclaration
{
public:
+ virtual ~IFDE_CSSDeclaration() {}
virtual IFDE_CSSValue* GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL &bImportant) const = 0;
virtual FX_POSITION GetStartPosition() const = 0;
virtual void GetNextProperty(FX_POSITION &pos, FDE_CSSPROPERTY &eProperty, IFDE_CSSValue *&pValue, FX_BOOL &bImportant) const = 0;
@@ -397,6 +399,7 @@ enum FDE_CSSSELECTORTYPE {
class IFDE_CSSSelector
{
public:
+ virtual ~IFDE_CSSSelector() {}
virtual FDE_CSSSELECTORTYPE GetType() const = 0;
virtual FX_DWORD GetNameHash() const = 0;
virtual IFDE_CSSSelector* GetNextSelector() const = 0;
@@ -419,6 +422,7 @@ enum FDE_CSSRULETYPE {
class IFDE_CSSRule
{
public:
+ virtual ~IFDE_CSSRule() {}
virtual FDE_CSSRULETYPE GetType() const = 0;
};
typedef CFX_MassArrayTemplate<IFDE_CSSRule*> CFDE_CSSRuleArray;
@@ -473,6 +477,7 @@ class IFDE_CSSStyleSheetCache
{
public:
static IFDE_CSSStyleSheetCache* Create();
+ virtual ~IFDE_CSSStyleSheetCache() {}
virtual void Release() = 0;
virtual void SetMaxItems(int32_t iMaxCount = 5) = 0;
virtual void AddStyleSheet(const CFX_ByteStringC& szKey, IFDE_CSSStyleSheet *pStyleSheet) = 0;
@@ -502,6 +507,7 @@ class IFDE_CSSSyntaxParser
{
public:
static IFDE_CSSSyntaxParser* Create();
+ virtual ~IFDE_CSSSyntaxParser() {}
virtual void Release() = 0;
virtual FX_BOOL Init(IFX_Stream *pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0;
virtual FX_BOOL Init(const FX_WCHAR* pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0;
@@ -842,6 +848,7 @@ enum FDE_CSSTEXTDECORATION {
class IFDE_CSSRubyStyle
{
public:
+ virtual ~IFDE_CSSRubyStyle() {}
virtual FDE_CSSRUBYALIGN GetRubyAlign() const = 0;
virtual FDE_CSSRUBYOVERHANG GetRubyOverhang() const = 0;
virtual FDE_CSSRUBYPOSITION GetRubyPosition() const = 0;
@@ -851,6 +858,7 @@ public:
class IFDE_CSSMultiColumnStyle
{
public:
+ virtual ~IFDE_CSSMultiColumnStyle() {}
virtual const FDE_CSSLENGTH& GetColumnCount() const = 0;
virtual const FDE_CSSLENGTH& GetColumnGap() const = 0;
virtual FX_ARGB GetColumnRuleColor() const = 0;
@@ -867,6 +875,7 @@ public:
class IFDE_CSSGeneratedContentStyle
{
public:
+ virtual ~IFDE_CSSGeneratedContentStyle() {}
virtual int32_t CountCounters() = 0;
virtual const FX_WCHAR* GetCounterIdentifier(int32_t index) = 0;
virtual FX_BOOL GetCounterReset(int32_t index, int32_t &iValue) = 0;
@@ -878,6 +887,7 @@ public:
class IFDE_CSSFontStyle
{
public:
+ virtual ~IFDE_CSSFontStyle() {}
virtual int32_t CountFontFamilies() const = 0;
virtual const FX_WCHAR* GetFontFamily(int32_t index) const = 0;
virtual FX_WORD GetFontWeight() const = 0;
@@ -894,6 +904,7 @@ public:
class IFDE_CSSBoundaryStyle
{
public:
+ virtual ~IFDE_CSSBoundaryStyle() {}
virtual FX_ARGB GetBorderLeftColor() const = 0;
virtual FX_ARGB GetBorderTopColor() const = 0;
virtual FX_ARGB GetBorderRightColor() const = 0;
@@ -922,6 +933,7 @@ public:
class IFDE_CSSPositionStyle
{
public:
+ virtual ~IFDE_CSSPositionStyle() {}
virtual FDE_CSSDISPLAY GetDisplay() const = 0;
virtual const FDE_CSSSIZE& GetBoxSize() const = 0;
virtual const FDE_CSSSIZE& GetMinBoxSize() const = 0;
@@ -943,6 +955,7 @@ public:
class IFDE_CSSParagraphStyle
{
public:
+ virtual ~IFDE_CSSParagraphStyle() {}
virtual FX_FLOAT GetLineHeight() const = 0;
virtual FDE_CSSWHITESPACE GetWhiteSpace() const = 0;
virtual const FDE_CSSLENGTH& GetTextIndent() const = 0;
@@ -991,6 +1004,7 @@ public:
class IFDE_CSSBackgroundStyle
{
public:
+ virtual ~IFDE_CSSBackgroundStyle() {}
virtual FX_ARGB GetBKGColor() const = 0;
virtual const FX_WCHAR* GetBKGImage() const = 0;
virtual FDE_CSSBKGREPEAT GetBKGRepeat() const = 0;
@@ -1002,6 +1016,7 @@ public:
class IFDE_CSSListStyle
{
public:
+ virtual ~IFDE_CSSListStyle() {}
virtual FDE_CSSLISTSTYLETYPE GetListStyleType() const = 0;
virtual FDE_CSSLISTSTYLEPOSITION GetListStylePosition() const = 0;
virtual const FX_WCHAR* GetListStyleImage() const = 0;
@@ -1011,11 +1026,13 @@ public:
class IFDE_CSSTableStyle
{
public:
+ virtual ~IFDE_CSSTableStyle() {}
virtual FDE_CSSCAPTIONSIDE GetCaptionSide() const = 0;
};
class IFDE_CSSVisualStyle
{
public:
+ virtual ~IFDE_CSSVisualStyle() {}
virtual FDE_CSSVISIBILITY GetVisibility() const = 0;
virtual FDE_CSSOVERFLOW GetOverflowX() const = 0;
virtual FDE_CSSOVERFLOW GetOverflowY() const = 0;
@@ -1053,6 +1070,7 @@ enum FDE_CSSSTYLESHEETPRIORITY {
class IFDE_CSSTagProvider
{
public:
+ virtual ~IFDE_CSSTagProvider() {}
virtual CFX_WideStringC GetTagName() = 0;
virtual FX_POSITION GetFirstAttribute() = 0;
virtual void GetNextAttribute(FX_POSITION &pos, CFX_WideStringC &wsAttr, CFX_WideStringC &wsValue) = 0;
@@ -1060,6 +1078,7 @@ public:
class IFDE_CSSAccelerator
{
public:
+ virtual ~IFDE_CSSAccelerator() {}
virtual void OnEnterTag(IFDE_CSSTagProvider *pTag) = 0;
virtual void OnLeaveTag(IFDE_CSSTagProvider *pTag) = 0;
};
@@ -1067,6 +1086,7 @@ class IFDE_CSSStyleSelector
{
public:
static IFDE_CSSStyleSelector* Create();
+ virtual ~IFDE_CSSStyleSelector() {}
virtual void Release() = 0;
virtual void SetFontMgr(IFX_FontMgr *pFontMgr) = 0;
virtual void SetDefFontSize(FX_FLOAT fFontSize) = 0;
diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h
index 92ed9daac6..f5ffda6a5a 100644
--- a/xfa/src/fdp/include/fde_img.h
+++ b/xfa/src/fdp/include/fde_img.h
@@ -19,6 +19,7 @@ class IFDE_Image
{
public:
static IFDE_Image* Create(IFX_Stream *pStream, int32_t iFormat = FDE_IMAGEFORMAT_Unknown);
+ virtual ~IFDE_Image() {}
virtual void Release() = 0;
virtual FX_BOOL LoadImage() = 0;
virtual void FreeImage() = 0;
diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fdp/include/fde_pen.h
index 074dc3c3e7..30f06ab70b 100644
--- a/xfa/src/fdp/include/fde_pen.h
+++ b/xfa/src/fdp/include/fde_pen.h
@@ -31,10 +31,12 @@ typedef struct _FDE_COMPOUNDPATTERN {
} FDE_COMPOUNDPATTERN, * FDE_LPCOMPOUNDPATTERN;
typedef FDE_COMPOUNDPATTERN const * FDE_LPCCOMPOUNDPATTERN;
typedef CFX_ArrayTemplate<FDE_COMPOUNDPATTERN> CFDE_CompoundPatterns;
+
class IFDE_Pen
{
public:
static IFDE_Pen* Create();
+ virtual ~IFDE_Pen() {}
virtual void Release() = 0;
virtual int32_t GetType() const = 0;
virtual FX_ARGB GetColor() const = 0;
diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h
index 9934cfae09..121b88b16b 100644
--- a/xfa/src/fdp/include/fde_psr.h
+++ b/xfa/src/fdp/include/fde_psr.h
@@ -19,6 +19,7 @@ typedef struct _FDE_HVISUALOBJ {
class IFDE_VisualSet
{
public:
+ virtual ~IFDE_VisualSet() {}
virtual FDE_VISUALOBJTYPE GetType() = 0;
virtual FX_BOOL GetBBox(FDE_HVISUALOBJ hVisualObj, CFX_RectF &bbox) = 0;
virtual FX_BOOL GetMatrix(FDE_HVISUALOBJ hVisualObj, CFX_Matrix &matrix) = 0;
@@ -85,6 +86,7 @@ class IFDE_VisualSetIterator
{
public:
static IFDE_VisualSetIterator* Create();
+ virtual ~IFDE_VisualSetIterator() {}
virtual void Release() = 0;
virtual FX_BOOL AttachCanvas(IFDE_CanvasSet *pCanvas) = 0;
virtual FX_BOOL FilterObjects(FX_DWORD dwObjects = 0xFFFFFFFF) = 0;
diff --git a/xfa/src/fdp/include/fde_pth.h b/xfa/src/fdp/include/fde_pth.h
index be3cc8d50e..5aa9997484 100644
--- a/xfa/src/fdp/include/fde_pth.h
+++ b/xfa/src/fdp/include/fde_pth.h
@@ -11,6 +11,7 @@ class IFDE_Path
{
public:
static IFDE_Path* Create();
+ virtual ~IFDE_Path() {}
virtual void Release() = 0;
virtual FX_BOOL StartFigure() = 0;
virtual FX_BOOL CloseFigure() = 0;
diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h
index cbae1c26fa..aef459f24d 100644
--- a/xfa/src/fdp/include/fde_rdr.h
+++ b/xfa/src/fdp/include/fde_rdr.h
@@ -8,7 +8,7 @@
#define _FDE_RENDERCONTEXT
class IFDE_Page;
class IFDE_RenderDevice;
-class IFDE_RenderContext;
+
void FDE_GetPageMatrix(CFX_Matrix &pageMatrix, const CFX_RectF &docPageRect, const CFX_Rect &devicePageRect, int32_t iRotate, FX_DWORD dwCoordinatesType = 0);
enum FDE_RENDERSTATUS {
FDE_RENDERSTATUS_Reset = 0,
@@ -16,10 +16,12 @@ enum FDE_RENDERSTATUS {
FDE_RENDERSTATUS_Done ,
FDE_RENDERSTATUS_Failed ,
};
+
class IFDE_RenderContext
{
public:
static IFDE_RenderContext* Create();
+ virtual ~IFDE_RenderContext() {}
virtual void Release() = 0;
virtual FX_BOOL StartRender(IFDE_RenderDevice *pRenderDevice,
IFDE_CanvasSet *pCanvasSet,
diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h
index 41e8d5c43d..4b02f22ba7 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fdp/include/fde_rdv.h
@@ -11,15 +11,17 @@ class IFDE_Brush;
class IFDE_Image;
class CFX_DIBitmap;
class CFX_DIBSource;
-class IFDE_RenderDevice;
+
typedef struct _FDE_HDEVICESTATE {
void* pData;
} * FDE_HDEVICESTATE;
+
class IFDE_RenderDevice
{
public:
static IFDE_RenderDevice* Create(CFX_DIBitmap *pBitmap, FX_BOOL bRgbByteOrder = FALSE);
static IFDE_RenderDevice* Create(CFX_RenderDevice *pDevice);
+ virtual ~IFDE_RenderDevice() {}
virtual void Release() = 0;
virtual int32_t GetWidth() const = 0;
diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h
index ec27490cfd..052f221238 100644
--- a/xfa/src/fdp/include/fde_tto.h
+++ b/xfa/src/fdp/include/fde_tto.h
@@ -31,10 +31,12 @@ class IFDE_TextOut;
#define FDE_TTOALIGNMENT_BottomCenter 9
#define FDE_TTOALIGNMENT_BottomRight 10
#define FDE_TTOALIGNMENT_BottomAuto 11
+
class IFDE_TextOut
{
public:
static IFDE_TextOut* Create();
+ virtual ~IFDE_TextOut() {}
virtual void Release() = 0;
virtual void SetFont(IFX_Font *pFont) = 0;
virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index 2ffa30c0fd..03f6438ed4 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -43,9 +43,11 @@ FX_BOOL FDE_IsXMLNameChar(FX_WCHAR ch, FX_BOOL bFirstChar);
#ifdef __cplusplus
}
#endif
+
class IFDE_XMLNode
{
public:
+ virtual ~IFDE_XMLNode() {}
virtual void Release() = 0;
virtual FDE_XMLNODETYPE GetType() const = 0;
virtual int32_t CountChildNodes() const = 0;
@@ -119,6 +121,7 @@ class IFDE_XMLCharData : public IFDE_XMLDeclaration
{
public:
static IFDE_XMLCharData* Create(const CFX_WideString &wsCData);
+ virtual ~IFDE_XMLCharData() {}
virtual void GetCharData(CFX_WideString &wsCData) const = 0;
virtual void SetCharData(const CFX_WideString &wsCData) = 0;
@@ -136,6 +139,7 @@ class IFDE_XMLDoc
{
public:
static IFDE_XMLDoc* Create();
+ virtual ~IFDE_XMLDoc() {}
virtual void Release() = 0;
virtual FX_BOOL LoadXML(IFX_Stream *pXMLStream, int32_t iXMLPlaneSize = 8192, int32_t iTextDataSize = 256, FDE_LPXMLREADERHANDLER pHandler = NULL) = 0;
virtual FX_BOOL LoadXML(IFDE_XMLParser *pXMLParser) = 0;
@@ -148,6 +152,7 @@ public:
class IFDE_XMLParser
{
public:
+ virtual ~IFDE_XMLParser() {}
virtual void Release() = 0;
virtual int32_t DoParser(IFX_Pause *pPause) = 0;
};
@@ -170,6 +175,7 @@ class IFDE_XMLSyntaxParser
{
public:
static IFDE_XMLSyntaxParser* Create();
+ virtual ~IFDE_XMLSyntaxParser() {}
virtual void Release() = 0;
virtual void Init(IFX_Stream *pStream, int32_t iXMLPlaneSize, int32_t iTextDataSize = 256) = 0;
virtual FX_DWORD DoSyntaxParse() = 0;