Merge to XFA: Remove typdefs for pointer types in fx_system.h.

Original Review URL: https://codereview.chromium.org/1171733003

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1178613002.

3 files changed, 15 insertions, 15 deletions

diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index b732f98d9c..a6cc5e1484 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -337,7 +337,7 @@ public:
                                     const CFX_RectF &rtAnchor, CFX_RectF &rtPopup) = 0;

     virtual FX_BOOL		PopupMenu(IXFA_Widget* hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0;

     virtual void		PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0;

-    virtual void		WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, FX_DWORD dwEvent, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL) = 0;

+    virtual void		WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, FX_DWORD dwEvent, void* pParam = NULL, void* pAdditional = NULL) = 0;

     virtual FX_BOOL		RenderCustomWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix, const CFX_RectF& rtUI)

     {

         return FALSE;

@@ -640,8 +640,8 @@ public:
 

     virtual void			GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, int32_t iNameType = 0) = 0;

     virtual	FX_BOOL			GetToolTip(IXFA_Widget* hWidget, CFX_WideString &wsToolTip) = 0;

-    virtual	void			SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) = 0;

-    virtual	FX_LPVOID		GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id) = 0;

+    virtual	void			SetPrivateData(IXFA_Widget* hWidget, void* module_id, void* pData, PD_CALLBACK_FREEDATA callback) = 0;

+    virtual	void*		GetPrivateData(IXFA_Widget* hWidget, void* module_id) = 0;

     virtual FX_BOOL			OnMouseEnter(IXFA_Widget* hWidget) = 0;

     virtual FX_BOOL			OnMouseExit(IXFA_Widget* hWidget) = 0;

     virtual FX_BOOL			OnLButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index dcf1ac2e95..b157fff24c 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -77,9 +77,9 @@ enum XFA_XDPPACKET_FLAGS {
 };

 typedef struct _XFA_PACKETINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_XDPPACKET				eName;

-    FX_LPCWSTR					pURI;

+    const FX_WCHAR*					pURI;

     FX_DWORD					eFlags;

 } XFA_PACKETINFO, * XFA_LPPACKETINFO;

 typedef XFA_PACKETINFO const * XFA_LPCPACKETINFO;

@@ -920,7 +920,7 @@ enum XFA_ELEMENT {
 #define XFA_ELEMENT_UNKNOWN ((XFA_ELEMENT)-1)

 typedef struct _XFA_ELEMENTINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_ELEMENT					eName;

     FX_DWORD					dwPackets;

     FX_DWORD					eObjectType;

@@ -939,17 +939,17 @@ enum XFA_ATTRIBUTETYPE {
 };

 typedef struct _XFA_ATTRIBUTEINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_ATTRIBUTE				eName;

     XFA_ATTRIBUTETYPE			eType;

     FX_DWORD					dwPackets;

-    FX_LPVOID					pDefValue;

+    void*					pDefValue;

 } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;

 typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;

 int32_t XFA_GetAttributeCount();

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);

-FX_BOOL XFA_GetAttributeDefaultValue(FX_LPVOID &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);

+FX_BOOL XFA_GetAttributeDefaultValue(void* &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);

 XFA_ATTRIBUTEENUM	XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 CFX_WideStringC		XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 FX_BOOL				XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

@@ -969,8 +969,8 @@ typedef struct _XFA_SCRIPTHIERARCHY {
     int16_t					wParentIndex;

 } XFA_SCRIPTHIERARCHY, * XFA_LPSCRIPTHIERARCHY;

 typedef XFA_SCRIPTHIERARCHY const * XFA_LPCSCRIPTHIERARCHY;

-FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);

-FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);

+const FX_WORD* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);

+const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);

 XFA_LPCELEMENTINFO XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, FX_DWORD dwPacket);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 #define XFA_PROPERTYFLAG_OneOf			0x01

@@ -985,7 +985,7 @@ XFA_LPCPROPERTY XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t &iCount);
 XFA_LPCPROPERTY XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, FX_DWORD dwPacket);

 typedef struct _XFA_ATTRIBUTEENUMINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_ATTRIBUTEENUM			eName;

 } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;

 typedef XFA_ATTRIBUTEENUMINFO const * XFA_LPCATTRIBUTEENUMINFO;

@@ -1050,7 +1050,7 @@ class CXFA_Object;
 typedef void (CXFA_Object::*XFA_METHOD_CALLBACK) (CFXJSE_Arguments* pArguments);

 typedef struct _XFA_METHODINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_METHOD_CALLBACK			lpfnCallback;

 } XFA_METHODINFO, * XFA_LPMETHODINFO;

 typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;

@@ -1063,7 +1063,7 @@ enum XFA_SCRIPT_TYPE {
 };

 typedef struct _XFA_SCRIPTATTRIBUTEINFO {

     uint32_t						uHash;

-    FX_LPCWSTR						pName;

+    const FX_WCHAR*						pName;

     XFA_ATTRIBUTE_CALLBACK			lpfnCallback;

     int32_t						eAttribute;

     FX_WORD							eValueType;

diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index 0ec3eaaaf4..21d007d7f1 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -63,7 +63,7 @@ public:
     void				SetImageImage(CFX_DIBitmap* newImage);

     void				SetImageEditImage(CFX_DIBitmap* newImage);

     void			UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL);

-    void			NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget = NULL, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL);

+    void			NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget = NULL, void* pParam = NULL, void* pAdditional = NULL);

 

 

     CXFA_Node*		GetDatasets();