diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-04-03 16:32:19 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-03 16:32:19 +0000 |
| commit | 232b918d1f0faec230652f4097b834257a7dbb27 (patch) | |
| tree | c13213ab3d70cc147a6ea59b0f090a51beecae8f /xfa | |
| parent | 36d7ad4a24287b562e1d88fcde635e36a167bfe3 (diff) | |
| download | pdfium-232b918d1f0faec230652f4097b834257a7dbb27.tar.xz | |
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 <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 2 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_break.h | 2 | ||||
| -rw-r--r-- | xfa/fwl/theme/cfwl_checkboxtp.h | 2 | ||||
| -rw-r--r-- | xfa/fwl/theme/cfwl_scrollbartp.h | 4 |
4 files changed, 5 insertions, 5 deletions
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<WideString> 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<CFGAS_GEFont> m_pFont; - CFX_BreakLine m_Line[2]; CFX_BreakLine* m_pCurLine; int8_t m_iReadyLineIndex; + CFX_BreakLine m_Line[2]; private: void FontChanged(); diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h index e373b382a8..c4341edf60 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.h +++ b/xfa/fwl/theme/cfwl_checkboxtp.h @@ -25,7 +25,6 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { protected: struct CKBThemeData { - FX_ARGB clrBoxBk[13][2]; FX_ARGB clrSignBorderNormal; FX_ARGB clrSignBorderDisable; FX_ARGB clrSignCheck; @@ -33,6 +32,7 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { FX_ARGB clrSignNeutralNormal; FX_ARGB clrSignNeutralHover; FX_ARGB clrSignNeutralPressed; + FX_ARGB clrBoxBk[13][2]; }; void DrawCheckSign(CFWL_Widget* pWidget, diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h index eec372c660..bae4e1902c 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.h +++ b/xfa/fwl/theme/cfwl_scrollbartp.h @@ -21,12 +21,12 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { protected: struct SBThemeData { + FX_ARGB clrTrackBKStart; + FX_ARGB clrTrackBKEnd; FX_ARGB clrPawColorLight[4]; FX_ARGB clrPawColorDark[4]; FX_ARGB clrBtnBK[4][2]; FX_ARGB clrBtnBorder[4]; - FX_ARGB clrTrackBKStart; - FX_ARGB clrTrackBKEnd; }; void DrawThumbBtn(CXFA_Graphics* pGraphics, |