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

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

Issue 2185533006: Splitting fx_ge_fontmap.cpp (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Add missing includes Created 4 years, 4 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 | « core/fxge/include/ifx_systemfontinfo.h ('k') | fpdfsdk/cfx_systemhandler.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 "core/fxge/include/fx_ge.h" 7 #include "core/fxge/include/fx_ge.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ 13 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
14 #include <crtdbg.h> 14 #include <crtdbg.h>
15 15
16 #include "core/fxcodec/include/fx_codec.h" 16 #include "core/fxcodec/include/fx_codec.h"
17 #include "core/fxcrt/include/fx_memory.h" 17 #include "core/fxcrt/include/fx_memory.h"
18 18
19 #ifndef _SKIA_SUPPORT_ 19 #ifndef _SKIA_SUPPORT_
20 #include "core/fxge/agg/fx_agg_driver.h" 20 #include "core/fxge/agg/fx_agg_driver.h"
21 #endif 21 #endif
22 22
23 #include "core/fxge/dib/dib_int.h" 23 #include "core/fxge/dib/dib_int.h"
24 #include "core/fxge/ge/cfx_folderfontinfo.h"
24 #include "core/fxge/ge/fx_text_int.h" 25 #include "core/fxge/ge/fx_text_int.h"
26 #include "core/fxge/include/cfx_fontmapper.h"
27 #include "core/fxge/include/ifx_systemfontinfo.h"
25 #include "core/fxge/include/fx_font.h" 28 #include "core/fxge/include/fx_font.h"
26 #include "core/fxge/include/fx_freetype.h" 29 #include "core/fxge/include/fx_freetype.h"
27 #include "core/fxge/include/fx_ge_win32.h" 30 #include "core/fxge/include/fx_ge_win32.h"
28 #include "core/fxge/win32/dwrite_int.h" 31 #include "core/fxge/win32/dwrite_int.h"
29 #include "core/fxge/win32/win32_int.h" 32 #include "core/fxge/win32/win32_int.h"
30 #include "third_party/base/stl_util.h" 33 #include "third_party/base/stl_util.h"
31 34
32 namespace { 35 namespace {
33 36
34 const struct { 37 const struct {
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 if (m_hDC) { 1418 if (m_hDC) {
1416 SelectObject(m_hDC, m_hOldBitmap); 1419 SelectObject(m_hDC, m_hOldBitmap);
1417 DeleteDC(m_hDC); 1420 DeleteDC(m_hDC);
1418 } 1421 }
1419 if (m_hBitmap) 1422 if (m_hBitmap)
1420 DeleteObject(m_hBitmap); 1423 DeleteObject(m_hBitmap);
1421 delete GetBitmap(); 1424 delete GetBitmap();
1422 } 1425 }
1423 1426
1424 #endif // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ 1427 #endif // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
OLDNEW
« no previous file with comments | « core/fxge/include/ifx_systemfontinfo.h ('k') | fpdfsdk/cfx_systemhandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698