diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-17 15:15:41 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-17 15:15:41 -0800 |
| commit | b8a51e2c5b476d0db5b75799911f0c8626012e9c (patch) | |
| tree | 070a128be38b2d846c51e16dc514d10e686fb172 /xfa/include | |
| parent | 10cfea1fdafc8fcf1edd60bc783e9db9ef6229c0 (diff) | |
| download | pdfium-b8a51e2c5b476d0db5b75799911f0c8626012e9c.tar.xz | |
Make FWL_ classes more consistently named.
Rename IFWL_Target::m_pData to m_pImpl since it points
to CFWL_*Imp classes.
Rename CFWL_Widget:m_pImp to m_pIface since it points
to IFWL_* interface classes. Here, the concrete classes
have pointers to the corresponding interfaces, rather
than inheriting from them, and this is likely due to
someone not understanding virtual inheritance (since this
code has the diamond problem in spades).
Rename CFWL_Target to CWFL_TargetImp since it is the root
of the CFWL_*Imp hierarchy, and is pointed to by the
m_pImpl slot.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1446393002 .
Diffstat (limited to 'xfa/include')
| -rw-r--r-- | xfa/include/fwl/core/fwl_target.h | 30 | ||||
| -rw-r--r-- | xfa/include/fwl/lightwidget/barcode.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/lightwidget/widget.h | 2 |
3 files changed, 27 insertions, 7 deletions
diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h index facd28fb70..25c8a33c90 100644 --- a/xfa/include/fwl/core/fwl_target.h +++ b/xfa/include/fwl/core/fwl_target.h @@ -4,9 +4,28 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FWL_TARGET_H
-#define _FWL_TARGET_H
-class IFWL_Target;
+#ifndef FWL_TARGET_H_
+#define FWL_TARGET_H_
+
+#include "core/include/fxcrt/fx_basic.h"
+
+// FWL contains three parallel inheritance hierarchies, which reference each
+// other via pointers as follows:
+//
+// m_pImpl
+// (nonesuch) IFWL_Target ----------> CFWL_TargetImp
+// | |
+// A A
+// m_pIface | |
+// CFWL_Widget ----------> IFWL_Widget CFWL_WidgetImp
+// | | |
+// A A A
+// | | |
+// CFWL_... IFWL_... CFWL_...Imp
+//
+
+class CFWL_TargetImp;
+
class IFWL_Target {
public:
FX_DWORD Release();
@@ -20,6 +39,7 @@ class IFWL_Target { protected:
virtual ~IFWL_Target();
- void* m_pData;
+ CFWL_TargetImp* m_pImpl;
};
-#endif
+
+#endif // FWL_TARGET_H_
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index ab1719373a..447a403f2e 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -35,7 +35,7 @@ class CFWL_Barcode : public CFWL_Edit { void SetDataLength(int32_t dataLength) {
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_DATALENGTH;
m_barcodeData.m_nDataLength = dataLength;
- ((IFWL_Barcode*)m_pImp)->SetLimit(dataLength);
+ ((IFWL_Barcode*)m_pIface)->SetLimit(dataLength);
}
void SetCalChecksum(int32_t calChecksum) {
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CALCHECKSUM;
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index 02f96e9bdf..c6a7e4b80e 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -88,7 +88,7 @@ class CFWL_Widget { CFX_SizeF CalcTextSize(const CFX_WideString& wsText,
FX_BOOL bMultiLine = FALSE,
int32_t iLineWidth = -1);
- IFWL_Widget* m_pImp;
+ IFWL_Widget* m_pIface;
IFWL_WidgetDelegate* m_pDelegate;
CFWL_WidgetMgr* m_pWidgetMgr;
CFWL_WidgetProperties* m_pProperties;
|