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

Side by Side Diff: core/src/fxge/android/fpf_skiafont.cpp

Issue 1748803002: Remove fx_fpf.h and IWYU (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase to master Created 4 years, 9 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/src/fxge/android/fpf_skiafont.h ('k') | core/src/fxge/android/fpf_skiafontmgr.h » ('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/src/fxge/android/fx_fpf.h" 7 #include "core/include/fxcrt/fx_system.h"
8
9 #if _FX_OS_ == _FX_ANDROID_
8 10
9 #include <algorithm> 11 #include <algorithm>
10 12
11 #if _FX_OS_ == _FX_ANDROID_ 13 #include "core/include/fxge/fx_freetype.h"
12 #include "core/src/fxge/android/fpf_skiafont.h" 14 #include "core/src/fxge/android/fpf_skiafont.h"
13 #include "core/src/fxge/android/fpf_skiafontmgr.h" 15 #include "core/src/fxge/android/fpf_skiafontmgr.h"
16
14 #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) 17 #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
18
15 CFPF_SkiaFont::CFPF_SkiaFont() 19 CFPF_SkiaFont::CFPF_SkiaFont()
16 : m_pFontMgr(NULL), 20 : m_pFontMgr(NULL),
17 m_pFontDes(NULL), 21 m_pFontDes(NULL),
18 m_Face(NULL), 22 m_Face(NULL),
19 m_dwStyle(0), 23 m_dwStyle(0),
20 m_uCharset(0), 24 m_uCharset(0),
21 m_dwRefCount(0) {} 25 m_dwRefCount(0) {}
22 CFPF_SkiaFont::~CFPF_SkiaFont() { 26 CFPF_SkiaFont::~CFPF_SkiaFont() {
23 if (m_Face) { 27 if (m_Face) {
24 FXFT_Done_Face(m_Face); 28 FXFT_Done_Face(m_Face);
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 return FALSE; 208 return FALSE;
205 } 209 }
206 m_dwStyle = dwStyle; 210 m_dwStyle = dwStyle;
207 m_uCharset = uCharset; 211 m_uCharset = uCharset;
208 m_pFontMgr = pFontMgr; 212 m_pFontMgr = pFontMgr;
209 m_pFontDes = pFontDes; 213 m_pFontDes = pFontDes;
210 m_dwRefCount = 1; 214 m_dwRefCount = 1;
211 return TRUE; 215 return TRUE;
212 } 216 }
213 #endif 217 #endif
OLDNEW
« no previous file with comments | « core/src/fxge/android/fpf_skiafont.h ('k') | core/src/fxge/android/fpf_skiafontmgr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698