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

core/src/fpdfapi/fpdf_render/render_int.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_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 
 #include <map>
@@ skipping 69 matching lines @@
   CPDF_Document* m_pPDFDoc;
   CFX_FontCache* m_pFontCache;
   CPDF_Type3CacheMap m_Type3FaceMap;
   CPDF_TransferFuncMap m_TransferFuncMap;
 };
 struct _PDF_RenderItem {
  public:
   CPDF_PageObjects* m_pObjectList;
   CFX_AffineMatrix m_Matrix;
 };
+
 typedef CFX_ArrayTemplate<_PDF_RenderItem> CPDF_RenderLayer;
+
 class IPDF_ObjectRenderer {
  public:
   static IPDF_ObjectRenderer* Create(int type);
   virtual ~IPDF_ObjectRenderer() {}
   virtual FX_BOOL Start(CPDF_RenderStatus* pRenderStatus,
                         const CPDF_PageObject* pObj,
                         const CFX_AffineMatrix* pObj2Device,
                         FX_BOOL bStdCS,
                         int blendType = FXDIB_BLEND_NORMAL) = 0;
   virtual FX_BOOL Continue(IFX_Pause* pPause) = 0;
   FX_BOOL m_Result;
 };
+
 class CPDF_RenderStatus {
  public:
   CPDF_RenderStatus();
   ~CPDF_RenderStatus();
   FX_BOOL Initialize(class CPDF_RenderContext* pContext,
                      CFX_RenderDevice* pDevice,
                      const CFX_AffineMatrix* pDeviceMatrix,
                      const CPDF_PageObject* pStopObj,
                      const CPDF_RenderStatus* pParentStatus,
                      const CPDF_GraphicStates* pInitialStates,
@@ skipping 199 matching lines @@
   FX_BOOL Continue(IFX_Pause* pPause);
 
  protected:
   CPDF_ImageLoader* m_pImageLoader;
   CPDF_PageRenderCache* m_pCache;
   CPDF_ImageObject* m_pImage;
   int32_t m_nDownsampleWidth;
   int32_t m_nDownsampleHeight;
 };
 class CFX_ImageTransformer;
+
 class CPDF_ImageRenderer : public IPDF_ObjectRenderer {
  public:
   CPDF_ImageRenderer();
-  ~CPDF_ImageRenderer();
+  ~CPDF_ImageRenderer() override;
+
+  // IPDF_ObjectRenderer
   FX_BOOL Start(CPDF_RenderStatus* pStatus,
                 const CPDF_PageObject* pObj,
                 const CFX_AffineMatrix* pObj2Device,
                 FX_BOOL bStdCS,
-                int blendType = FXDIB_BLEND_NORMAL);
+                int blendType = FXDIB_BLEND_NORMAL) override;
+  FX_BOOL Continue(IFX_Pause* pPause) override;
+
   FX_BOOL Start(CPDF_RenderStatus* pStatus,
                 const CFX_DIBSource* pDIBSource,
                 FX_ARGB bitmap_argb,
                 int bitmap_alpha,
                 const CFX_AffineMatrix* pImage2Device,
                 FX_DWORD flags,
                 FX_BOOL bStdCS,
                 int blendType = FXDIB_BLEND_NORMAL);
-  FX_BOOL Continue(IFX_Pause* pPause);
 
  protected:
   CPDF_RenderStatus* m_pRenderStatus;
   CPDF_ImageObject* m_pImageObject;
   int m_Status;
   const CFX_AffineMatrix* m_pObj2Device;
   CFX_AffineMatrix m_ImageMatrix;
   CPDF_ImageLoader m_Loader;
   const CFX_DIBSource* m_pDIBSource;
   CFX_DIBitmap* m_pClone;
   int m_BitmapAlpha;
   FX_BOOL m_bPatternColor;
   CPDF_Pattern* m_pPattern;
   FX_ARGB m_FillArgb;
   FX_DWORD m_Flags;
   CPDF_QuickStretcher* m_pQuickStretcher;
   CFX_ImageTransformer* m_pTransformer;
   void* m_DeviceHandle;
   void* m_LoadHandle;
   FX_BOOL m_bStdCS;
   int m_BlendType;
   FX_BOOL StartBitmapAlpha();
   FX_BOOL StartDIBSource();
   FX_BOOL StartRenderDIBSource();
   FX_BOOL StartLoadDIBSource();
   FX_BOOL DrawMaskedImage();
   FX_BOOL DrawPatternImage(const CFX_Matrix* pObj2Device);
 };
+
 class CPDF_ScaledRenderBuffer {
  public:
   CPDF_ScaledRenderBuffer();
   ~CPDF_ScaledRenderBuffer();
   FX_BOOL Initialize(CPDF_RenderContext* pContext,
                      CFX_RenderDevice* pDevice,
                      FX_RECT* pRect,
                      const CPDF_PageObject* pObj,
                      const CPDF_RenderOptions* pOptions = NULL,
                      int max_dpi = 0);
@@ skipping 98 matching lines @@
   CFX_DIBSource* m_pCachedMask;
   FX_DWORD m_dwCacheSize;
   void CalcSize();
 };
 typedef struct {
   FX_FLOAT m_DecodeMin;
   FX_FLOAT m_DecodeStep;
   int m_ColorKeyMin;
   int m_ColorKeyMax;
 } DIB_COMP_DATA;
+
 class CPDF_DIBSource : public CFX_DIBSource {
  public:
   CPDF_DIBSource();
-  virtual ~CPDF_DIBSource();
+  ~CPDF_DIBSource() override;
+
   FX_BOOL Load(CPDF_Document* pDoc,
                const CPDF_Stream* pStream,
                CPDF_DIBSource** ppMask,
                FX_DWORD* pMatteColor,
                CPDF_Dictionary* pFormResources,
                CPDF_Dictionary* pPageResources,
                FX_BOOL bStdCS = FALSE,
                FX_DWORD GroupFamily = 0,
                FX_BOOL bLoadMask = FALSE);
-  virtual FX_BOOL SkipToScanline(int line, IFX_Pause* pPause) const;
-  virtual uint8_t* GetBuffer() const;
-  virtual const uint8_t* GetScanline(int line) const;
-  virtual void DownSampleScanline(int line,
-                                  uint8_t* dest_scan,
-                                  int dest_bpp,
-                                  int dest_width,
-                                  FX_BOOL bFlipX,
-                                  int clip_left,
-                                  int clip_width) const;
-  virtual void SetDownSampleSize(int dest_width, int dest_height) const;
+
+  // CFX_DIBSource
+  FX_BOOL SkipToScanline(int line, IFX_Pause* pPause) const override;
+  uint8_t* GetBuffer() const override;
+  const uint8_t* GetScanline(int line) const override;
+  void DownSampleScanline(int line,
+                          uint8_t* dest_scan,
+                          int dest_bpp,
+                          int dest_width,
+                          FX_BOOL bFlipX,
+                          int clip_left,
+                          int clip_width) const override;
+  void SetDownSampleSize(int dest_width, int dest_height) const override;
+
   CFX_DIBitmap* GetBitmap() const;
   void ReleaseBitmap(CFX_DIBitmap*) const;
   void ClearImageData();
 
  public:
   int StartLoadDIBSource(CPDF_Document* pDoc,
                          const CPDF_Stream* pStream,
                          FX_BOOL bHasMask,
                          CPDF_Dictionary* pFormResources,
                          CPDF_Dictionary* pPageResources,
@@ skipping 42 matching lines @@
   FX_BOOL m_bDefaultDecode;
   FX_BOOL m_bImageMask;
   FX_BOOL m_bDoBpcCheck;
   FX_BOOL m_bColorKey;
   DIB_COMP_DATA* m_pCompData;
   uint8_t* m_pLineBuf;
   uint8_t* m_pMaskedLine;
   nonstd::unique_ptr<CFX_DIBitmap> m_pCachedBitmap;
   ICodec_ScanlineDecoder* m_pDecoder;
 };
+
 #define FPDF_HUGE_IMAGE_SIZE 60000000
 class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
  public:
   CPDF_DIBTransferFunc(const CPDF_TransferFunc* pTransferFunc);
-  virtual FXDIB_Format GetDestFormat();
-  virtual FX_ARGB* GetDestPalette() { return NULL; }
-  virtual void TranslateScanline(uint8_t* dest_buf,
-                                 const uint8_t* src_buf) const;
-  virtual void TranslateDownSamples(uint8_t* dest_buf,
-                                    const uint8_t* src_buf,
-                                    int pixels,
-                                    int Bpp) const;
+  ~CPDF_DIBTransferFunc() override;
+
+  // CFX_FilteredDIB
+  FXDIB_Format GetDestFormat() override;
+  FX_ARGB* GetDestPalette() override { return NULL; }
+  void TranslateScanline(uint8_t* dest_buf,
+                         const uint8_t* src_buf) const override;
+  void TranslateDownSamples(uint8_t* dest_buf,
+                            const uint8_t* src_buf,
+                            int pixels,
+                            int Bpp) const override;
+
   const uint8_t* m_RampR;
   const uint8_t* m_RampG;
   const uint8_t* m_RampB;
 };
+
 struct _CPDF_UniqueKeyGen {
   void Generate(int count, ...);
   FX_CHAR m_Key[128];
   int m_KeyLen;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_