diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 11:29:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 11:29:12 -0700 |
| commit | b116136da234afcad018bb44a3ccb64b9ad2a554 (patch) | |
| tree | e81b2016bc21485d1d6bdc7c1a5c65f610f18b20 /core/src/fxge/win32/fx_win32_dwrite.cpp | |
| parent | b69545dd059b8a5bb3695969e622462559c97276 (diff) | |
| download | pdfium-b116136da234afcad018bb44a3ccb64b9ad2a554.tar.xz | |
Merge to XFA: Remove more cruft from fx_system.h
New manual edits in the following to fix compilation:
fx_bmp.h, fx_gif.h, fx_graphics.h
Original Review URL: https://codereview.chromium.org/1169963003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1170103004
Diffstat (limited to 'core/src/fxge/win32/fx_win32_dwrite.cpp')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_dwrite.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 1ad4f8c457..022325b5ac 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -5,7 +5,7 @@ // 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_ +#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include "../../../include/fxge/fx_ge_win32.h" #include "dwrite_int.h" #include <dwrite.h> @@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject) } return newObject; } -class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream +class CDwFontFileStream final : public IDWriteFontFileStream { public: explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize); @@ -46,7 +46,7 @@ private: void const* resourcePtr_; DWORD resourceSize_; }; -class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader +class CDwFontFileLoader final : public IDWriteFontFileLoader { public: virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject); |