Merge to XFA: Fix some override warnings in fpdfview.cpp.
authorLei Zhang <thestig@chromium.org>
Tue, 20 Oct 2015 00:27:53 +0000 (17:27 -0700)
committerLei Zhang <thestig@chromium.org>
Tue, 20 Oct 2015 00:27:53 +0000 (17:27 -0700)
TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1410733004 .

(cherry picked from commit 0f2736742f5f9841447a4bd505dcadda22e2f574)

Review URL: https://codereview.chromium.org/1409853003 .

fpdfsdk/src/fpdfview.cpp

index 48c8de4..cfc2f0d 100644 (file)
@@ -313,9 +313,9 @@ class CMemFile final : public IFX_FileRead {
  public:
   CMemFile(uint8_t* pBuf, FX_FILESIZE size) : m_pBuf(pBuf), m_size(size) {}
 
-  virtual void Release() { delete this; }
-  virtual FX_FILESIZE GetSize() { return m_size; }
-  virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) {
+  void Release() override { delete this; }
+  FX_FILESIZE GetSize() override { return m_size; }
+  FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override {
     if (offset < 0) {
       return FALSE;
     }
@@ -332,9 +332,10 @@ class CMemFile final : public IFX_FileRead {
  private:
   ~CMemFile() override {}
 
-  uint8_t* m_pBuf;
-  FX_FILESIZE m_size;
+  uint8_t* const m_pBuf;
+  const FX_FILESIZE m_size;
 };
+
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadMemDocument(const void* data_buf,
                                                      int size,
                                                      FPDF_BYTESTRING password) {