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

core/src/fxge/win32/fx_win32_device.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 "../../../include/fxge/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <crtdbg.h>
 
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "../../../include/fxge/fx_ge_win32.h"
 #include "../agg/include/fx_agg_driver.h"
 #include "../dib/dib_int.h"
 #include "../ge/text_int.h"
 #include "dwrite_int.h"
 #include "win32_int.h"
 
 class CFX_Win32FontInfo final : public IFX_SystemFontInfo {
  public:
   CFX_Win32FontInfo();
-  ~CFX_Win32FontInfo();
-  virtual void Release();
-  virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper);
-  virtual void* MapFont(int weight,
-                        FX_BOOL bItalic,
-                        int charset,
-                        int pitch_family,
-                        const FX_CHAR* face,
-                        int& iExact);
-  virtual void* GetFont(const FX_CHAR* face) { return NULL; }
-  virtual FX_DWORD GetFontData(void* hFont,
-                               FX_DWORD table,
-                               uint8_t* buffer,
-                               FX_DWORD size);
-  virtual void DeleteFont(void* hFont);
-  virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name);
-  virtual FX_BOOL GetFontCharset(void* hFont, int& charset);
+  ~CFX_Win32FontInfo() override;
+
+  // IFX_SystemFontInfo
+  void Release() override;
+  FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override;
+  void* MapFont(int weight,
+                FX_BOOL bItalic,
+                int charset,
+                int pitch_family,
+                const FX_CHAR* face,
+                int& iExact) override;
+  void* GetFont(const FX_CHAR* face) override { return NULL; }
+  FX_DWORD GetFontData(void* hFont,
+                       FX_DWORD table,
+                       uint8_t* buffer,
+                       FX_DWORD size) override;
+  FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override;
+  FX_BOOL GetFontCharset(void* hFont, int& charset) override;
+  void DeleteFont(void* hFont) override;
+
   FX_BOOL IsOpenTypeFromDiv(const LOGFONTA* plf);
   FX_BOOL IsSupportFontFormDiv(const LOGFONTA* plf);
   void AddInstalledFont(const LOGFONTA* plf, FX_DWORD FontType);
   void GetGBPreference(CFX_ByteString& face, int weight, int picth_family);
   void GetJapanesePreference(CFX_ByteString& face,
                              int weight,
                              int picth_family);
   CFX_ByteString FindFont(const CFX_ByteString& name);
   HDC m_hDC;
   CFX_FontMapper* m_pMapper;
   CFX_ByteString m_LastFamily;
   CFX_ByteString m_KaiTi, m_FangSong;
 };
+
 CFX_Win32FontInfo::CFX_Win32FontInfo() {
   m_hDC = CreateCompatibleDC(NULL);
 }
 CFX_Win32FontInfo::~CFX_Win32FontInfo() {
   m_pMapper = NULL;
 }
 void CFX_Win32FontInfo::Release() {
   DeleteDC(m_hDC);
   delete this;
 }
@@ skipping 1255 matching lines @@
     SelectObject(m_hDC, m_hOldBitmap);
     DeleteDC(m_hDC);
   }
   if (m_hBitmap) {
     DeleteObject(m_hBitmap);
   }
   delete GetBitmap();
 }
 
 #endif  // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_