diff options
author | Lei Zhang <thestig@chromium.org> | 2015-08-14 21:49:19 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 21:49:19 -0700 |
commit | 62b2e912dc2a508972fbf01b25f7449c39ff1543 (patch) | |
tree | 47a244dc5891b2a338ca529b796e12994e642cbc /core/include/fxge/fx_ge.h | |
parent | bdf72c353af5b8a34ef5efdeddfff36d2089a158 (diff) | |
download | pdfium-62b2e912dc2a508972fbf01b25f7449c39ff1543.tar.xz |
Merge to XFA: Use override in more classes in core/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1292613003 .
(cherry picked from commit c2c3f7b5f0396409451a9d344f35ec1929a76e9f)
Review URL: https://codereview.chromium.org/1296043002 .
Diffstat (limited to 'core/include/fxge/fx_ge.h')
-rw-r--r-- | core/include/fxge/fx_ge.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index 0aa3f17d4d..23be3648d1 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -10,17 +10,12 @@ #include "fx_dib.h" #include "fx_font.h" -class CFX_ClipRgn; -class CFX_PathData; -class CFX_GraphStateData; class CFX_Font; class CFX_FontMgr; class CFX_FontCache; class CFX_FaceCache; -class CFX_RenderDevice; class IFX_RenderDeviceDriver; class CCodec_ModuleMgr; -class IFXG_PaintModuleMgr; class CFX_GEModule { public: @@ -434,8 +429,7 @@ class CFX_RenderDevice { class CFX_FxgeDevice : public CFX_RenderDevice { public: CFX_FxgeDevice(); - - ~CFX_FxgeDevice(); + ~CFX_FxgeDevice() override; FX_BOOL Attach(CFX_DIBitmap* pBitmap, int dither_bits = 0, @@ -455,8 +449,7 @@ class CFX_FxgeDevice : public CFX_RenderDevice { class CFX_SkiaDevice : public CFX_RenderDevice { public: CFX_SkiaDevice(); - - ~CFX_SkiaDevice(); + ~CFX_SkiaDevice() override; FX_BOOL Attach(CFX_DIBitmap* pBitmap, int dither_bits = 0, @@ -473,6 +466,7 @@ class CFX_SkiaDevice : public CFX_RenderDevice { protected: FX_BOOL m_bOwnedBitmap; }; + class IFX_RenderDeviceDriver { public: static IFX_RenderDeviceDriver* CreateFxgeDriver( @@ -612,14 +606,16 @@ class IFX_RenderDeviceDriver { virtual void ClearDriver() {} }; + class IFX_PSOutput { public: virtual void Release() = 0; virtual void OutputPS(const FX_CHAR* string, int len) = 0; protected: - ~IFX_PSOutput() {} + virtual ~IFX_PSOutput() {} }; + class CPSFont; class CFX_PSRenderer { public: |