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.

5 files changed, 41 insertions, 41 deletions

diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h
index 0c9b323954..c55f6c471e 100644
--- a/xfa/src/fdp/include/fde_css.h
+++ b/xfa/src/fdp/include/fde_css.h
@@ -242,9 +242,9 @@ public:
     virtual FDE_CSSPRIMITIVETYPE	GetPrimitiveType() const = 0;

     virtual FX_ARGB					GetRGBColor() const = 0;

     virtual FX_FLOAT				GetFloat() const = 0;

-    virtual FX_LPCWSTR				GetString(int32_t &iLength) const = 0;

+    virtual const FX_WCHAR*				GetString(int32_t &iLength) const = 0;

     virtual FDE_CSSPROPERTYVALUE	GetEnum() const = 0;

-    virtual	FX_LPCWSTR				GetFuncName() const = 0;

+    virtual	const FX_WCHAR*				GetFuncName() const = 0;

     virtual int32_t				CountArgs() const = 0;

     virtual IFDE_CSSValue*			GetArgs(int32_t index) const = 0;

 };

@@ -458,7 +458,7 @@ class IFDE_CSSStyleSheet : public IFX_Unknown
 public:

     static IFDE_CSSStyleSheet*		LoadHTMLStandardStyleSheet();

     static IFDE_CSSStyleSheet*		LoadFromStream(const CFX_WideString &szUrl, IFX_Stream *pStream, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL);

-    static IFDE_CSSStyleSheet*		LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL);

+    static IFDE_CSSStyleSheet*		LoadFromBuffer(const CFX_WideString &szUrl, const FX_WCHAR* pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL);

     virtual FX_BOOL					GetUrl(CFX_WideString &szUrl) = 0;

     virtual FX_DWORD				GetMediaList() const = 0;

     virtual FX_WORD					GetCodePage() const = 0;

@@ -504,10 +504,10 @@ public:
     static IFDE_CSSSyntaxParser*	Create();

     virtual void					Release() = 0;

     virtual FX_BOOL					Init(IFX_Stream *pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0;

-    virtual FX_BOOL					Init(FX_LPCWSTR pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0;

+    virtual FX_BOOL					Init(const FX_WCHAR* pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0;

 

     virtual FDE_CSSSYNTAXSTATUS		DoSyntaxParse() = 0;

-    virtual FX_LPCWSTR				GetCurrentString(int32_t &iLength) const = 0;

+    virtual const FX_WCHAR*				GetCurrentString(int32_t &iLength) const = 0;

 };

 enum FDE_CSSLENGTHUNIT {

     FDE_CSSLENGTHUNIT_Auto,

@@ -868,18 +868,18 @@ class IFDE_CSSGeneratedContentStyle
 {

 public:

     virtual int32_t				CountCounters() = 0;

-    virtual FX_LPCWSTR				GetCounterIdentifier(int32_t index) = 0;

+    virtual const FX_WCHAR*				GetCounterIdentifier(int32_t index) = 0;

     virtual FX_BOOL					GetCounterReset(int32_t index, int32_t &iValue) = 0;

     virtual FX_BOOL					GetCounterIncrement(int32_t index, int32_t &iValue) = 0;

     virtual IFDE_CSSValueList*		GetContent() const = 0;

     virtual int32_t				CountQuotes() const = 0;

-    virtual FX_LPCWSTR				GetQuotes(int32_t index) const = 0;

+    virtual const FX_WCHAR*				GetQuotes(int32_t index) const = 0;

 };

 class IFDE_CSSFontStyle

 {

 public:

     virtual int32_t				CountFontFamilies() const = 0;

-    virtual FX_LPCWSTR				GetFontFamily(int32_t index) const = 0;

+    virtual const FX_WCHAR*				GetFontFamily(int32_t index) const = 0;

     virtual FX_WORD					GetFontWeight() const = 0;

     virtual FDE_CSSFONTVARIANT		GetFontVariant() const = 0;

     virtual FDE_CSSFONTSTYLE		GetFontStyle() const = 0;

@@ -964,7 +964,7 @@ public:
     virtual FDE_CSSLINEBREAK		GetLineBreak() const = 0;

     virtual FDE_CSSTEXTEMPHASISMARK	GetTextEmphasisMark() const = 0;

     virtual FDE_CSSTEXTEMPHASISFILL	GetTextEmphasisFill() const = 0;

-    virtual FX_LPCWSTR				GetTextEmphasisCustom() const = 0;

+    virtual const FX_WCHAR*				GetTextEmphasisCustom() const = 0;

     virtual FDE_CSSTEXTCOMBINE		GetTextCombineType() const = 0;

     virtual FX_BOOL					HasTextCombineNumber() const = 0;

     virtual FX_FLOAT				GetTextCombineNumber() const = 0;

@@ -992,7 +992,7 @@ class IFDE_CSSBackgroundStyle
 {

 public:

     virtual FX_ARGB					GetBKGColor() const = 0;

-    virtual FX_LPCWSTR				GetBKGImage() const = 0;

+    virtual const FX_WCHAR*				GetBKGImage() const = 0;

     virtual FDE_CSSBKGREPEAT		GetBKGRepeat() const = 0;

     virtual FDE_CSSBKGATTACHMENT	GetBKGAttachment() const = 0;

     virtual const FDE_CSSPOINT&		GetBKGPosition() const = 0;

@@ -1004,7 +1004,7 @@ class IFDE_CSSListStyle
 public:

     virtual FDE_CSSLISTSTYLETYPE		GetListStyleType() const = 0;

     virtual FDE_CSSLISTSTYLEPOSITION	GetListStylePosition() const = 0;

-    virtual FX_LPCWSTR					GetListStyleImage() const = 0;

+    virtual const FX_WCHAR*					GetListStyleImage() const = 0;

     virtual void						SetListStyleType(FDE_CSSLISTSTYLETYPE eListStyleType) = 0;

     virtual void						SetListStylePosition(FDE_CSSLISTSTYLEPOSITION eListStylePosition) = 0;

 };

diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h
index 974f4cc879..9934cfae09 100644
--- a/xfa/src/fdp/include/fde_psr.h
+++ b/xfa/src/fdp/include/fde_psr.h
@@ -14,7 +14,7 @@ enum FDE_VISUALOBJTYPE {
     FDE_VISUALOBJ_Widget	=  0x08	,

 };

 typedef struct _FDE_HVISUALOBJ {

-    FX_LPVOID pData;

+    void* pData;

 } const * FDE_HVISUALOBJ;

 class IFDE_VisualSet

 {

diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h
index eb79a81c9b..41e8d5c43d 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fdp/include/fde_rdv.h
@@ -13,7 +13,7 @@ class CFX_DIBitmap;
 class CFX_DIBSource;

 class IFDE_RenderDevice;

 typedef struct _FDE_HDEVICESTATE {

-    FX_LPVOID pData;

+    void* pData;

 } * FDE_HDEVICESTATE;

 class IFDE_RenderDevice

 {

diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h
index 8b4d1d4787..ec27490cfd 100644
--- a/xfa/src/fdp/include/fde_tto.h
+++ b/xfa/src/fdp/include/fde_tto.h
@@ -51,19 +51,19 @@ public:
     virtual void		SetClipRect(const CFX_RectF &rtClip) = 0;

     virtual void		SetMatrix(const CFX_Matrix &matrix) = 0;

     virtual void		SetLineBreakTolerance(FX_FLOAT fTolerance) = 0;

-    virtual void		CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size) = 0;

-    virtual void		CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0;

-    virtual void		CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect) = 0;

-    virtual void		CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0;

-    virtual void		DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y) = 0;

-    virtual void		DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;

-    virtual void		DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect) = 0;

-    virtual void		DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;

+    virtual void		CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Size &size) = 0;

+    virtual void		CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) = 0;

+    virtual void		CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Rect &rect) = 0;

+    virtual void		CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) = 0;

+    virtual void		DrawText(const FX_WCHAR* pwsStr, int32_t iLength, int32_t x, int32_t y) = 0;

+    virtual void		DrawText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;

+    virtual void		DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_Rect &rect) = 0;

+    virtual void		DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;

     virtual void		SetLogicClipRect(const CFX_RectF &rtClip) = 0;

-    virtual void		CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0;

-    virtual void		CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0;

-    virtual void		DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;

-    virtual void		DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;

+    virtual void		CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) = 0;

+    virtual void		CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) = 0;

+    virtual void		DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;

+    virtual void		DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;

     virtual int32_t	GetTotalLines() = 0;

 };

 #endif

diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index eddb9a1835..2ffa30c0fd 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -51,7 +51,7 @@ public:
     virtual int32_t		CountChildNodes() const = 0;

     virtual IFDE_XMLNode*	GetChildNode(int32_t index) const = 0;

     virtual int32_t		GetChildNodeIndex(IFDE_XMLNode *pNode) const = 0;

-    virtual IFDE_XMLNode*	GetPath(FX_LPCWSTR pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0;

+    virtual IFDE_XMLNode*	GetPath(const FX_WCHAR* pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0;

     virtual int32_t		InsertChildNode(IFDE_XMLNode *pNode, int32_t index = -1) = 0;

     virtual void			RemoveChildNode(IFDE_XMLNode *pNode) = 0;

     virtual void			DeleteChildren() = 0;

@@ -70,14 +70,14 @@ public:
     virtual void				GetTargetName(CFX_WideString &wsTarget) const = 0;

     virtual int32_t		CountAttributes() const = 0;

     virtual FX_BOOL			GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0;

-    virtual FX_BOOL			HasAttribute(FX_LPCWSTR pwsAttriName) const = 0;

-    virtual void			GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0;

+    virtual FX_BOOL			HasAttribute(const FX_WCHAR* pwsAttriName) const = 0;

+    virtual void			GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const = 0;

     virtual void			SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0;

-    virtual int32_t		GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0;

-    virtual void			SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0;

-    virtual FX_FLOAT		GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0;

-    virtual void			SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0;

-    virtual void			RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0;

+    virtual int32_t		GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const = 0;

+    virtual void			SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) = 0;

+    virtual FX_FLOAT		GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const = 0;

+    virtual void			SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) = 0;

+    virtual void			RemoveAttribute(const FX_WCHAR* pwsAttriName) = 0;

     virtual int32_t		CountData() const = 0;

     virtual FX_BOOL			GetData(int32_t index, CFX_WideString &wsData) const = 0;

     virtual void			AppendData(const CFX_WideString &wsData) = 0;

@@ -93,14 +93,14 @@ public:
     virtual void			GetNamespaceURI(CFX_WideString &wsNamespace) const = 0;

     virtual int32_t		CountAttributes() const = 0;

     virtual FX_BOOL			GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0;

-    virtual FX_BOOL			HasAttribute(FX_LPCWSTR pwsAttriName) const = 0;

-    virtual void			GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0;

+    virtual FX_BOOL			HasAttribute(const FX_WCHAR* pwsAttriName) const = 0;

+    virtual void			GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const = 0;

     virtual void			SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0;

-    virtual int32_t		GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0;

-    virtual void			SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0;

-    virtual FX_FLOAT		GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0;

-    virtual void			SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0;

-    virtual void			RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0;

+    virtual int32_t		GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const = 0;

+    virtual void			SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) = 0;

+    virtual FX_FLOAT		GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const = 0;

+    virtual void			SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) = 0;

+    virtual void			RemoveAttribute(const FX_WCHAR* pwsAttriName) = 0;

     virtual void			GetTextData(CFX_WideString &wsText) const = 0;

     virtual void			SetTextData(const CFX_WideString &wsText) = 0;

 };

@@ -124,7 +124,7 @@ public:
     virtual void				SetCharData(const CFX_WideString &wsCData) = 0;

 };

 typedef struct _FDE_XMLREADERHANDLER {

-    FX_LPVOID pData;

+    void* pData;

 

     void	(*OnTagEnter)(_FDE_XMLREADERHANDLER *pThis, FDE_XMLNODETYPE eType, const CFX_WideString &wsTagName);

     void	(*OnTagBreak)(_FDE_XMLREADERHANDLER *pThis, const CFX_WideString &wsTagName);