From 61ff9b659a5b992e3e3ba4000f7ca5c799cc9ebf Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 2 Jul 2018 19:23:53 +0000 Subject: Comment some raw pointers that cant become UnownedPtr<>. These appear in compile-time const data. Adding the comment makes it easier to see what work remains when using grep. Change-Id: Ibb5fe920dc9fc99dd4c866f9ddf800a58f6a67a8 Reviewed-on: https://pdfium-review.googlesource.com/36690 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxge/cfx_fontmapper.cpp | 18 +++++++++++------- core/fxge/cfx_fontmgr.cpp | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp index e6fc984edc..c7a7015680 100644 --- a/core/fxge/cfx_fontmapper.cpp +++ b/core/fxge/cfx_fontmapper.cpp @@ -41,10 +41,12 @@ const char* const g_Base14FontNames[kNumStandardFonts] = { "ZapfDingbats", }; -const struct AltFontName { - const char* m_pName; +struct AltFontName { + const char* m_pName; // Raw, POD struct. int m_Index; -} g_AltFontNames[] = { +}; + +const AltFontName g_AltFontNames[] = { {"Arial", 4}, {"Arial,Bold", 5}, {"Arial,BoldItalic", 6}, @@ -136,10 +138,12 @@ const struct AltFontName { {"ZapfDingbats", 13}, }; -const struct AltFontFamily { - const char* m_pFontName; - const char* m_pFontFamily; -} g_AltFontFamilies[] = { +struct AltFontFamily { + const char* m_pFontName; // Raw, POD struct. + const char* m_pFontFamily; // Raw, POD struct. +}; + +const AltFontFamily g_AltFontFamilies[] = { {"AGaramondPro", "Adobe Garamond Pro"}, {"BankGothicBT-Medium", "BankGothic Md BT"}, {"ForteMT", "Forte"}, diff --git a/core/fxge/cfx_fontmgr.cpp b/core/fxge/cfx_fontmgr.cpp index 2ee46373d5..85999a1976 100644 --- a/core/fxge/cfx_fontmgr.cpp +++ b/core/fxge/cfx_fontmgr.cpp @@ -20,7 +20,7 @@ namespace { struct BuiltinFont { - const uint8_t* m_pFontData; + const uint8_t* m_pFontData; // Raw, POD struct. uint32_t m_dwSize; }; -- cgit v1.2.3