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

core/src/fxcodec/codec/fx_codec_flate.cpp

 // 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
 
 #include "../../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../../third_party/zlib_v128/zlib.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcodec/fx_codec_flate.h"
@@ skipping 585 matching lines @@
   const int last_row_size = data_size % row_size;
   for (int row = 0; row < row_count; row++) {
     uint8_t* scan_line = data_buf + row * row_size;
     if ((row + 1) * row_size > (int)data_size) {
       row_size = last_row_size;
     }
     TIFF_PredictLine(scan_line, row_size, BitsPerComponent, Colors, Columns);
   }
   return TRUE;
 }
+
 class CCodec_FlateScanlineDecoder : public CCodec_ScanlineDecoder {
  public:
   CCodec_FlateScanlineDecoder();
-  ~CCodec_FlateScanlineDecoder();
+  ~CCodec_FlateScanlineDecoder() override;
+
   void Create(const uint8_t* src_buf,
               FX_DWORD src_size,
               int width,
               int height,
               int nComps,
               int bpc,
               int predictor,
               int Colors,
               int BitsPerComponent,
               int Columns);
-  virtual void Destroy() { delete this; }
-  virtual void v_DownScale(int dest_width, int dest_height) {}
-  virtual FX_BOOL v_Rewind();
-  virtual uint8_t* v_GetNextLine();
-  virtual FX_DWORD GetSrcOffset();
+  void Destroy() { delete this; }
+
+  // CCodec_ScanlineDecoder
+  void v_DownScale(int dest_width, int dest_height) override {}
+  FX_BOOL v_Rewind() override;
+  uint8_t* v_GetNextLine() override;
+  FX_DWORD GetSrcOffset() override;
+
   void* m_pFlate;
   const uint8_t* m_SrcBuf;
   FX_DWORD m_SrcSize;
   uint8_t* m_pScanline;
   uint8_t* m_pLastLine;
   uint8_t* m_pPredictBuffer;
   uint8_t* m_pPredictRaw;
   int m_Predictor;
   int m_Colors, m_BitsPerComponent, m_Columns, m_PredictPitch, m_LeftOver;
 };
+
 CCodec_FlateScanlineDecoder::CCodec_FlateScanlineDecoder() {
   m_pFlate = NULL;
   m_pScanline = NULL;
   m_pLastLine = NULL;
   m_pPredictBuffer = NULL;
   m_pPredictRaw = NULL;
   m_LeftOver = 0;
 }
 CCodec_FlateScanlineDecoder::~CCodec_FlateScanlineDecoder() {
   if (m_pScanline) {
@@ skipping 323 matching lines @@
                                    FX_DWORD src_size,
                                    uint8_t*& dest_buf,
                                    FX_DWORD& dest_size) {
   dest_size = src_size + src_size / 1000 + 12;
   dest_buf = FX_Alloc(uint8_t, dest_size);
   unsigned long temp_size = dest_size;
   FPDFAPI_FlateCompress(dest_buf, &temp_size, src_buf, src_size);
   dest_size = (FX_DWORD)temp_size;
   return TRUE;
 }