summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-05-25 16:57:11 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-25 16:57:11 -0700
commit7fa5513e973f9ee6bd34b9ca1e76ad208598191f (patch)
treecfa2fd3d93c2c4c7649de2266188d6b3d2676d7c /core
parentec3da5b821ed65c53eff1c78c2493afd7d933371 (diff)
downloadpdfium-7fa5513e973f9ee6bd34b9ca1e76ad208598191f.tar.xz
Banish CFX_PrivateData to the XFA side
Remove an unused inheritance. The remaining usages are a little more intricate. Review-Url: https://codereview.chromium.org/2015743002
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/codec/ccodec_iccmodule.h1
-rw-r--r--core/fxcrt/fx_basic_util.cpp2
-rw-r--r--core/fxcrt/include/fx_basic.h4
3 files changed, 5 insertions, 2 deletions
diff --git a/core/fxcodec/codec/ccodec_iccmodule.h b/core/fxcodec/codec/ccodec_iccmodule.h
index 9eabd38482..822b202e3f 100644
--- a/core/fxcodec/codec/ccodec_iccmodule.h
+++ b/core/fxcodec/codec/ccodec_iccmodule.h
@@ -14,7 +14,6 @@
class CFX_BinaryBuf;
class CFX_IccProfileCache;
class CFX_IccTransformCache;
-class CFX_PrivateData;
class IFX_FileRead;
class CCodec_IccModule {
diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
index b073ea8f17..be5200fc6f 100644
--- a/core/fxcrt/fx_basic_util.cpp
+++ b/core/fxcrt/fx_basic_util.cpp
@@ -17,6 +17,7 @@
#include <algorithm>
#include <cctype>
+#ifdef PDF_ENABLE_XFA
CFX_PrivateData::CFX_PrivateData() {}
CFX_PrivateData::~CFX_PrivateData() {
@@ -95,6 +96,7 @@ void CFX_PrivateData::ClearAll() {
}
m_DataList.RemoveAll();
}
+#endif // PDF_ENABLE_XFA
void FX_atonum(const CFX_ByteStringC& strc, FX_BOOL& bInteger, void* pData) {
if (strc.Find('.') == -1) {
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h
index 0f517e7217..73cb648a46 100644
--- a/core/fxcrt/include/fx_basic.h
+++ b/core/fxcrt/include/fx_basic.h
@@ -618,8 +618,9 @@ class CFX_PtrList {
public:
~CFX_PtrList();
};
-typedef void (*PD_CALLBACK_FREEDATA)(void* pData);
+#ifdef PDF_ENABLE_XFA
+typedef void (*PD_CALLBACK_FREEDATA)(void* pData);
struct FX_PRIVATEDATA {
void FreeData();
@@ -666,6 +667,7 @@ class CFX_PrivateData {
PD_CALLBACK_FREEDATA callback,
FX_BOOL bSelfDestruct);
};
+#endif // PDF_ENABLE_XFA
class CFX_BitStream {
public: