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

core/include/fxge/fx_ge.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_FXGE_FX_GE_H_
 #define CORE_INCLUDE_FXGE_FX_GE_H_
 
 #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:
   static void Create();
 
   static void Use(CFX_GEModule* pMgr);
 
   static CFX_GEModule* Get();
 
   static void Destroy();
@@ skipping 393 matching lines @@
   IFX_RenderDeviceDriver* m_pDeviceDriver;
 
  private:
   void InitDeviceInfo();
 
   void UpdateClipBox();
 };
 class CFX_FxgeDevice : public CFX_RenderDevice {
  public:
   CFX_FxgeDevice();
-
-  ~CFX_FxgeDevice();
+  ~CFX_FxgeDevice() override;
 
   FX_BOOL Attach(CFX_DIBitmap* pBitmap,
                  int dither_bits = 0,
                  FX_BOOL bRgbByteOrder = FALSE,
                  CFX_DIBitmap* pOriDevice = NULL,
                  FX_BOOL bGroupKnockout = FALSE);
 
   FX_BOOL Create(int width,
                  int height,
                  FXDIB_Format format,
                  int dither_bits = 0,
                  CFX_DIBitmap* pOriDevice = NULL);
 
  protected:
   FX_BOOL m_bOwnedBitmap;
 };
 class CFX_SkiaDevice : public CFX_RenderDevice {
  public:
   CFX_SkiaDevice();
-
-  ~CFX_SkiaDevice();
+  ~CFX_SkiaDevice() override;
 
   FX_BOOL Attach(CFX_DIBitmap* pBitmap,
                  int dither_bits = 0,
                  FX_BOOL bRgbByteOrder = FALSE,
                  CFX_DIBitmap* pOriDevice = NULL,
                  FX_BOOL bGroupKnockout = FALSE);
 
   FX_BOOL Create(int width,
                  int height,
                  FXDIB_Format format,
                  int dither_bits = 0,
                  CFX_DIBitmap* pOriDevice = NULL);
 
  protected:
   FX_BOOL m_bOwnedBitmap;
 };
+
 class IFX_RenderDeviceDriver {
  public:
   static IFX_RenderDeviceDriver* CreateFxgeDriver(
       CFX_DIBitmap* pBitmap,
       FX_BOOL bRgbByteOrder = FALSE,
       CFX_DIBitmap* pOriDevice = NULL,
       FX_BOOL bGroupKnockout = FALSE);
 
   virtual ~IFX_RenderDeviceDriver() {}
   virtual void Begin() {}
@@ skipping 119 matching lines @@
                                  void* pIccTransform = NULL) {
     return FALSE;
   }
 
   virtual void* GetPlatformSurface() { return NULL; }
 
   virtual int GetDriverType() { return 0; }
 
   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:
   CFX_PSRenderer();
 
   ~CFX_PSRenderer();
 
   void Init(IFX_PSOutput* pOutput,
             int ps_level,
             int width,
@@ skipping 91 matching lines @@
   void FindPSFontGlyph(CFX_FaceCache* pFaceCache,
                        CFX_Font* pFont,
                        const FXTEXT_CHARPOS& charpos,
                        int& ps_fontnum,
                        int& ps_glyphindex);
 
   void WritePSBinary(const uint8_t* data, int len);
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_GE_H_