From b5e8f14e3eefc5da995b332788d3203cee204883 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 15:18:35 -0700 Subject: Remove FX_DWORD from core/ and delete definition Review URL: https://codereview.chromium.org/1832173003 --- core/fxge/android/fpf_skiafontmgr.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fxge/android/fpf_skiafontmgr.h') diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h index 5ba5b16475..5ed409cccc 100644 --- a/core/fxge/android/fpf_skiafontmgr.h +++ b/core/fxge/android/fpf_skiafontmgr.h @@ -44,9 +44,9 @@ class CFPF_SkiaFontDescriptor { m_pFamily[iSize] = 0; } FX_CHAR* m_pFamily; - FX_DWORD m_dwStyle; + uint32_t m_dwStyle; int32_t m_iFaceIndex; - FX_DWORD m_dwCharsets; + uint32_t m_dwCharsets; int32_t m_iGlyphNum; }; @@ -100,8 +100,8 @@ class CFPF_SkiaFontMgr : public IFPF_FontMgr { void LoadPrivateFont(void* pBuffer, size_t szBuffer) override; IFPF_Font* CreateFont(const CFX_ByteStringC& bsFamilyname, uint8_t uCharset, - FX_DWORD dwStyle, - FX_DWORD dwMatch = 0) override; + uint32_t dwStyle, + uint32_t dwMatch = 0) override; FX_BOOL InitFTLibrary(); FXFT_Face GetFontFace(IFX_FileRead* pFileRead, int32_t iFaceIndex = 0); @@ -119,7 +119,7 @@ class CFPF_SkiaFontMgr : public IFPF_FontMgr { FX_BOOL m_bLoaded; FXFT_Library m_FTLibrary; std::vector m_FontFaces; - std::map m_FamilyFonts; + std::map m_FamilyFonts; }; #endif -- cgit v1.2.3