summaryrefslogtreecommitdiff
path: root/core/src/fxge/ge/text_int.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-14 12:54:38 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-14 12:54:38 -0700
commit4926900ab54a493d236291b5a24dfa4476792182 (patch)
treee53800a0569300516c934bfccbb036ce39d98cb3 /core/src/fxge/ge/text_int.h
parenteddab4425614e49146f904f00da4a664ba4b581b (diff)
downloadpdfium-4926900ab54a493d236291b5a24dfa4476792182.tar.xz
Kill CFX_Object.
CFX_Object is a type that implements its own new operators that return NULL on error. There's no need for this given the |new (std::nothrow)| syntax; in fact, the current code can only work if there is no activity in the constructors. This may explain the pervasive lack of constructors and reliance on Init() methods throughout the codebase. The activity takes place in fx_memory.h, where FX_NEW is mapped onto the std::nothrow syntax. The rest is just cleanup. Down the road, we will simply throw and remove all the error-checking paths for new objects. Landing this patch first will at least show a simple path back to the old behaviour without having to re-introduce CFX_Object should someone want to do so in their own fork. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1088733002
Diffstat (limited to 'core/src/fxge/ge/text_int.h')
-rw-r--r--core/src/fxge/ge/text_int.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index c8d55965e3..d6b794a800 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();