Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Side by Side Diff: core/src/fxge/win32/fx_win32_device.cpp

Issue 406683005: Fix remaining -Wdelete-non-virtual-dtor violations on Windows. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: . Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | core/src/fxge/win32/fx_win32_dwrite.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../../include/fxge/fx_ge.h" 7 #include "../../../include/fxge/fx_ge.h"
8 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ 8 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
9 #include "../../../include/fxge/fx_ge_win32.h" 9 #include "../../../include/fxge/fx_ge_win32.h"
10 #include <crtdbg.h> 10 #include <crtdbg.h>
11 #include "../agg/include/fxfx_agg_clip_liang_barsky.h" 11 #include "../agg/include/fxfx_agg_clip_liang_barsky.h"
12 #include "dwrite_int.h" 12 #include "dwrite_int.h"
13 #include "win32_int.h" 13 #include "win32_int.h"
14 #include "../ge/text_int.h" 14 #include "../ge/text_int.h"
15 #include "../dib/dib_int.h" 15 #include "../dib/dib_int.h"
16 #include "../agg/include/fx_agg_driver.h" 16 #include "../agg/include/fx_agg_driver.h"
17 #include "../../../include/fxge/fx_freetype.h" 17 #include "../../../include/fxge/fx_freetype.h"
18 #include "../../../include/fxcodec/fx_codec.h" 18 #include "../../../include/fxcodec/fx_codec.h"
19 class CWin32FontInfo : public IFX_SystemFontInfo 19 class CWin32FontInfo FX_FINAL : public IFX_SystemFontInfo
20 { 20 {
21 public: 21 public:
22 CWin32FontInfo(); 22 CWin32FontInfo();
23 ~CWin32FontInfo(); 23 ~CWin32FontInfo();
24 virtual void Release(); 24 virtual void Release();
25 virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper); 25 virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper);
26 virtual void* MapFont(int weight, FX_BOOL bItalic, int charset , int pitch_family, FX_LPCSTR face, FX_BOOL& bExact); 26 virtual void* MapFont(int weight, FX_BOOL bItalic, int charset , int pitch_family, FX_LPCSTR face, FX_BOOL& bExact);
27 virtual void* GetFont(FX_LPCSTR face) 27 virtual void* GetFont(FX_LPCSTR face)
28 { 28 {
29 return NULL; 29 return NULL;
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 if (m_hDC) { 1191 if (m_hDC) {
1192 SelectObject(m_hDC, m_hOldBitmap); 1192 SelectObject(m_hDC, m_hOldBitmap);
1193 DeleteDC(m_hDC); 1193 DeleteDC(m_hDC);
1194 } 1194 }
1195 if (m_hBitmap) { 1195 if (m_hBitmap) {
1196 DeleteObject(m_hBitmap); 1196 DeleteObject(m_hBitmap);
1197 } 1197 }
1198 delete GetBitmap(); 1198 delete GetBitmap();
1199 } 1199 }
1200 #endif 1200 #endif
OLDNEW
« no previous file with comments | « no previous file | core/src/fxge/win32/fx_win32_dwrite.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698