diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src/fxge/ge | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'core/src/fxge/ge')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_ps.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxge/ge/text_int.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp index d664b706b0..9da224602e 100644 --- a/core/src/fxge/ge/fx_ge_ps.cpp +++ b/core/src/fxge/ge/fx_ge_ps.cpp @@ -13,7 +13,7 @@ struct PSGlyph { FX_BOOL m_bGlyphAdjust; FX_FLOAT m_AdjustMatrix[4]; }; -class CPSFont : public CFX_Object +class CPSFont { public: PSGlyph m_Glyphs[256]; diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index e51976f172..7f30b9c802 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -12,7 +12,7 @@ struct _CFX_UniqueKeyGen { FX_CHAR m_Key[128]; int m_KeyLen; }; -class CFX_SizeGlyphCache : public CFX_Object +class CFX_SizeGlyphCache { public: CFX_SizeGlyphCache() @@ -22,7 +22,7 @@ public: ~CFX_SizeGlyphCache(); CFX_MapPtrToPtr m_GlyphMap; }; -class CTTFontDesc : public CFX_Object +class CTTFontDesc { public: CTTFontDesc() @@ -74,7 +74,7 @@ private: #define CHARSET_FLAG_BIG5 8 #define CHARSET_FLAG_GB 16 #define CHARSET_FLAG_KOREAN 32 -class CFontFaceInfo : public CFX_Object +class CFontFaceInfo { public: CFX_ByteString m_FilePath; @@ -85,7 +85,7 @@ public: FX_DWORD m_FileSize; CFX_ByteString m_FontTables; }; -class CFontFileFaceInfo : public CFX_Object +class CFontFileFaceInfo { public: CFontFileFaceInfo(); |