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

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

Issue 2377393002: Move core/fxge/include to core/fxge (Closed)
Patch Set: Rebase to master Created 4 years, 2 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/android/fpf_skiafont.h ('k') | core/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/fxcrt/fx_system.h" 7 #include "core/fxcrt/fx_system.h"
8 8
9 #if _FX_OS_ == _FX_ANDROID_ 9 #if _FX_OS_ == _FX_ANDROID_
10 10
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "core/fxge/android/fpf_skiafont.h" 13 #include "core/fxge/android/fpf_skiafont.h"
14 #include "core/fxge/android/fpf_skiafontmgr.h" 14 #include "core/fxge/android/fpf_skiafontmgr.h"
15 #include "core/fxge/include/fx_freetype.h" 15 #include "core/fxge/fx_freetype.h"
16 16
17 #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 18
19 CFPF_SkiaFont::CFPF_SkiaFont() 19 CFPF_SkiaFont::CFPF_SkiaFont()
20 : m_pFontMgr(nullptr), 20 : m_pFontMgr(nullptr),
21 m_pFontDes(nullptr), 21 m_pFontDes(nullptr),
22 m_Face(nullptr), 22 m_Face(nullptr),
23 m_dwStyle(0), 23 m_dwStyle(0),
24 m_uCharset(0), 24 m_uCharset(0),
25 m_dwRefCount(0) {} 25 m_dwRefCount(0) {}
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 m_dwStyle = dwStyle; 211 m_dwStyle = dwStyle;
212 m_uCharset = uCharset; 212 m_uCharset = uCharset;
213 m_pFontMgr = pFontMgr; 213 m_pFontMgr = pFontMgr;
214 m_pFontDes = pFontDes; 214 m_pFontDes = pFontDes;
215 m_dwRefCount = 1; 215 m_dwRefCount = 1;
216 return TRUE; 216 return TRUE;
217 } 217 }
218 218
219 #endif // _FX_OS_ == _FX_ANDROID_ 219 #endif // _FX_OS_ == _FX_ANDROID_
OLDNEW
« no previous file with comments | « core/fxge/android/fpf_skiafont.h ('k') | core/fxge/android/fpf_skiafontmgr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698