From 4701fcddeddfef7bccbceaf0f439dee82c3639f0 Mon Sep 17 00:00:00 2001 From: weili Date: Mon, 20 Jun 2016 11:41:56 -0700 Subject: Fix clang_use_chrome_plugin for Mac and Skia builds These changes are specific to Mac and Skia builds. They are needed for these builds to compile with clang_use_chrome_plugin. BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2081523002 --- xfa/fgas/font/fgas_stdfontmgr.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fgas/font/fgas_stdfontmgr.h') diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index 11d91fc7f5..66b1412d10 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h @@ -82,11 +82,8 @@ uint32_t FX_GetGdiFontStyles(const LOGFONTW& lf); class CFX_FontDescriptor { public: - CFX_FontDescriptor() : m_nFaceIndex(0), m_dwFontStyles(0) { - m_dwUsb[0] = m_dwUsb[1] = m_dwUsb[2] = m_dwUsb[3] = 0; - m_dwCsb[0] = m_dwCsb[1] = 0; - } - ~CFX_FontDescriptor() {} + CFX_FontDescriptor(); + ~CFX_FontDescriptor(); int32_t m_nFaceIndex; CFX_WideString m_wsFaceName; @@ -95,6 +92,7 @@ class CFX_FontDescriptor { uint32_t m_dwUsb[4]; uint32_t m_dwCsb[2]; }; + typedef CFX_ArrayTemplate CFX_FontDescriptors; struct FX_FontDescriptorInfo { @@ -112,6 +110,7 @@ struct FX_FontDescriptorInfo { return nPenalty == other.nPenalty; } }; + typedef CFX_ArrayTemplate CFX_FontDescriptorInfos; struct FX_HandleParentPath { @@ -127,6 +126,7 @@ struct FX_HandleParentPath { class CFX_FontSourceEnum_File { public: CFX_FontSourceEnum_File(); + ~CFX_FontSourceEnum_File(); void Release() { delete this; } FX_POSITION GetStartPosition(); -- cgit v1.2.3