diff options
| author | Nico Weber <thakis@chromium.org> | 2014-07-21 09:50:56 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2014-07-21 09:50:56 -0700 |
| commit | baca77096e21acb07fa0b6e3a9ca7b926d18dcf1 (patch) | |
| tree | 505a88eef01a11b536671931f1ecc23431905ed4 | |
| parent | b72977f8c3efda2ceea6d25b1e042dfd6ea49c77 (diff) | |
| download | pdfium-baca77096e21acb07fa0b6e3a9ca7b926d18dcf1.tar.xz | |
Fix remaining -Wdelete-non-virtual-dtor violations on Windows.
Follow-up to https://codereview.chromium.org/370853002/
BUG=none
R=bo_xu@foxitsoftware.com
Review URL: https://codereview.chromium.org/406683005
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_dwrite.cpp | 4 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_gdipext.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index 044468ff05..154bbc407c 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -16,7 +16,7 @@ #include "../agg/include/fx_agg_driver.h" #include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxcodec/fx_codec.h" -class CWin32FontInfo : public IFX_SystemFontInfo +class CWin32FontInfo FX_FINAL : public IFX_SystemFontInfo { public: CWin32FontInfo(); diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 0326798ec3..2b32d572b5 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject) } return newObject; } -class CDwFontFileStream : public IDWriteFontFileStream, public CFX_Object +class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream, public CFX_Object { public: explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize); @@ -46,7 +46,7 @@ private: void const* resourcePtr_; DWORD resourceSize_; }; -class CDwFontFileLoader : public IDWriteFontFileLoader, public CFX_Object +class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader, public CFX_Object { public: virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject); diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 1aada3a1f3..82ff2be952 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -1003,7 +1003,7 @@ BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData, CallFunc(GdipDeleteGraphics)(pGraphics); return TRUE; } -class GpStream : public IStream, public CFX_Object +class GpStream FX_FINAL : public IStream, public CFX_Object { LONG m_RefCount; int m_ReadPos; |