From 7fa5513e973f9ee6bd34b9ca1e76ad208598191f Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Wed, 25 May 2016 16:57:11 -0700
Subject: 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
---
 core/fxcodec/codec/ccodec_iccmodule.h | 1 -
 core/fxcrt/fx_basic_util.cpp          | 2 ++
 core/fxcrt/include/fx_basic.h         | 4 +++-
 xfa/fxfa/include/xfa_ffwidget.h       | 2 +-
 4 files changed, 6 insertions(+), 3 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:
diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h
index 783bac5ab4..0e58a3406a 100644
--- a/xfa/fxfa/include/xfa_ffwidget.h
+++ b/xfa/fxfa/include/xfa_ffwidget.h
@@ -40,7 +40,7 @@ class CXFA_CalcData {
   int32_t m_iRefCount;
 };
 
-class CXFA_FFWidget : public CFX_PrivateData, public CXFA_ContentLayoutItem {
+class CXFA_FFWidget : public CXFA_ContentLayoutItem {
  public:
   CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
   virtual ~CXFA_FFWidget();
-- 
cgit v1.2.3