From 232b918d1f0faec230652f4097b834257a7dbb27 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 3 Apr 2018 16:32:19 +0000 Subject: Re-arrange so inline vectors come last in structs. This might make the memory tools more effective in finding OOBs. Change-Id: Id093bb0a88c37954c80d612ac00b5a168e75bdbf Reviewed-on: https://pdfium-review.googlesource.com/29550 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- xfa/fgas/font/cfgas_fontmgr.h | 2 +- xfa/fgas/layout/cfx_break.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fgas') diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 6b98fbe394..f4a62847d6 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -71,9 +71,9 @@ class CFX_FontDescriptor { ~CFX_FontDescriptor(); int32_t m_nFaceIndex; + uint32_t m_dwFontStyles; WideString m_wsFaceName; std::vector m_wsFamilyNames; - uint32_t m_dwFontStyles; uint32_t m_dwUsb[4]; uint32_t m_dwCsb[2]; }; diff --git a/xfa/fgas/layout/cfx_break.h b/xfa/fgas/layout/cfx_break.h index 789220d9da..7356cff3ba 100644 --- a/xfa/fgas/layout/cfx_break.h +++ b/xfa/fgas/layout/cfx_break.h @@ -82,9 +82,9 @@ class CFX_Break { int32_t m_iDefChar; wchar_t m_wDefChar; RetainPtr m_pFont; - CFX_BreakLine m_Line[2]; CFX_BreakLine* m_pCurLine; int8_t m_iReadyLineIndex; + CFX_BreakLine m_Line[2]; private: void FontChanged(); -- cgit v1.2.3