Remove more _CAPS names

R=thestig@chromium.org

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

6 files changed, 49 insertions, 49 deletions

diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h
index f68da73a77..d3d9fc8610 100644
--- a/xfa/src/fdp/include/fde_brs.h
+++ b/xfa/src/fdp/include/fde_brs.h
@@ -25,11 +25,10 @@ class IFDE_LinearGradientBrush;
 #define FDE_WRAPMODE_TileFlipY 2
 #define FDE_WRAPMODE_TileFlipXY 3
 #define FDE_WRAPMODE_Clamp 4
-typedef struct _FDE_GRADIENTCOLOR {
+struct FDE_GRADIENTCOLOR {
   FX_FLOAT pos;
   FX_ARGB color;
-} FDE_GRADIENTCOLOR, *FDE_LPGRADIENTCOLOR;
-typedef FDE_GRADIENTCOLOR const* FDE_LPCGRADIENTCOLOR;
+};
 typedef CFX_ArrayTemplate<FDE_GRADIENTCOLOR> CFDE_GradientColors;
 class IFDE_Brush {
  public:
diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h
index b1612cb91f..ea501259ed 100644
--- a/xfa/src/fdp/include/fde_img.h
+++ b/xfa/src/fdp/include/fde_img.h
@@ -49,6 +49,7 @@ class IFDE_Image {
   virtual int32_t DoLoadImage(IFX_Pause* pPause = NULL) = 0;
   virtual void StopLoadImage() = 0;
 };
+
 #define FDE_IMAGEFILTER_Unknown -1
 #define FDE_IMAGEFILTER_Opacity 0
 #define FDE_IMAGEFILTER_GrayScale 1
@@ -58,34 +59,34 @@ class IFDE_Image {
 #define FDE_IMAGEFILTER_MaskColor 5
 #define FDE_IMAGEFILTER_Brightness 6
 #define FDE_IMAGEFILTER_Contrast 7
-typedef struct _FDE_IMAGEFILTERPARAMS : public CFX_Target {
+
+struct FDE_IMAGEFILTERPARAMS : public CFX_Target {
   int32_t iFilterType;
-} FDE_IMAGEFILTERPARAMS, *FDE_LPIMAGEFILTERPARAMS;
-typedef FDE_IMAGEFILTERPARAMS const* FDE_LPCIMAGEFILTERPARAMS;
-typedef struct _FDE_OPACITYPARAMS : public FDE_IMAGEFILTERPARAMS {
+};
+
+struct FDE_OPACITYPARAMS : public FDE_IMAGEFILTERPARAMS {
   int32_t iOpacity;
-} FDE_OPACITYPARAMS, *FDE_LPOPACITYPARAMS;
-typedef FDE_OPACITYPARAMS const* FDE_LPCOPACITYPARAMS;
-typedef struct _FDE_BLACKWHITEPARAMS : public FDE_IMAGEFILTERPARAMS {
+};
+
+struct FDE_BLACKWHITEPARAMS : public FDE_IMAGEFILTERPARAMS {
   FX_ARGB dwBlackColor;
   FX_ARGB dwWhiteColor;
-} FDE_BLACKWHITEPARAMS, *FDE_LPBLACKWHITEPARAMS;
-typedef FDE_BLACKWHITEPARAMS const* FDE_LPCBLACKWHITEPARAMS;
-typedef struct _FDE_TRANSPARENTPARAMS : public FDE_IMAGEFILTERPARAMS {
+};
+
+struct FDE_TRANSPARENTPARAMS : public FDE_IMAGEFILTERPARAMS {
   FX_ARGB color;
-} FDE_TRANSPARENTPARAMS, *FDE_LPTRANSPARENTPARAMS;
-typedef FDE_TRANSPARENTPARAMS const* FDE_LPCTRANSPARENTPARAMS;
-typedef struct _FDE_MASKCOLORPARAMS : public FDE_IMAGEFILTERPARAMS {
+};
+
+struct FDE_MASKCOLORPARAMS : public FDE_IMAGEFILTERPARAMS {
   FX_ARGB color;
-} FDE_MASKCOLORPARAMS, *FDE_LPMASKCOLORPARAMS;
-typedef FDE_MASKCOLORPARAMS const* FDE_LPCMASKCOLORPARAMS;
-typedef struct _FDE_BRIGHTNESSPARAMS : public FDE_IMAGEFILTERPARAMS {
+};
+
+struct FDE_BRIGHTNESSPARAMS : public FDE_IMAGEFILTERPARAMS {
   int32_t iBrightness;
-} FDE_BRIGHTNESSPARAMS, *FDE_LPBRIGHTNESSPARAMS;
-typedef FDE_BRIGHTNESSPARAMS const* FDE_LPCBRIGHTNESSPARAMS;
-typedef struct _FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS {
+};
+
+struct FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS {
   int32_t iContrast;
-} FDE_CONTRASTPARAMS, *FDE_LPCONTRASTPARAMS;
-typedef FDE_CONTRASTPARAMS const* FDE_LPCCONTRASTPARAMS;
+};
 
 #endif  // XFA_SRC_FDP_INCLUDE_FDE_IMG_H_
diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fdp/include/fde_pen.h
index a335c972ee..904d7215ea 100644
--- a/xfa/src/fdp/include/fde_pen.h
+++ b/xfa/src/fdp/include/fde_pen.h
@@ -8,29 +8,33 @@
 #define XFA_SRC_FDP_INCLUDE_FDE_PEN_H_
 
 class IFDE_Pen;
+
 #define FDE_PENTYPE_Unknown FDE_BRUSHTYPE_Unknown
 #define FDE_PENTYPE_SolidColor FDE_BRUSHTYPE_Solid
 #define FDE_PENTYPE_HatchBrush FDE_BRUSHTYPE_Hatch
 #define FDE_PENTYPE_TextureBrush FDE_BRUSHTYPE_Texture
 #define FDE_PENTYPE_LinearGradient FDE_BRUSHTYPE_LinearGradient
 #define FDE_PENTYPE_MAX FDE_BRUSHTYPE_MAX
+
 #define FDE_DASHSTYLE_Solid 0
 #define FDE_DASHSTYLE_Dash 1
 #define FDE_DASHSTYLE_Dot 2
 #define FDE_DASHSTYLE_DashDot 3
 #define FDE_DASHSTYLE_DashDotDot 4
 #define FDE_DASHSTYLE_Customized 5
+
 #define FDE_LINEJOIN_Miter 0
 #define FDE_LINEJOIN_Round 1
 #define FDE_LINEJOIN_Bevel 2
+
 #define FDE_LINECAP_Flat 0
 #define FDE_LINECAP_Round 1
 #define FDE_LINECAP_Square 2
-typedef struct _FDE_COMPOUNDPATTERN {
+
+struct FDE_COMPOUNDPATTERN {
   FX_FLOAT pos;
   FX_FLOAT width;
-} FDE_COMPOUNDPATTERN, *FDE_LPCOMPOUNDPATTERN;
-typedef FDE_COMPOUNDPATTERN const* FDE_LPCCOMPOUNDPATTERN;
+};
 typedef CFX_ArrayTemplate<FDE_COMPOUNDPATTERN> CFDE_CompoundPatterns;
 
 class IFDE_Pen {
diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h
index 253eb8d903..72ff91fa87 100644
--- a/xfa/src/fdp/include/fde_psr.h
+++ b/xfa/src/fdp/include/fde_psr.h
@@ -25,7 +25,7 @@ enum FDE_VISUALOBJTYPE {
   FDE_VISUALOBJ_Widget = 0x08,
 };
 
-typedef struct _FDE_HVISUALOBJ { void* pData; } const* FDE_HVISUALOBJ;
+typedef struct FDE_HVISUALOBJ_ { void* pData; } const* FDE_HVISUALOBJ;
 
 class IFDE_VisualSet {
  public:
@@ -63,8 +63,8 @@ class IFDE_ImageSet : public IFDE_VisualSet {
  public:
   virtual IFDE_Image* GetImage(FDE_HVISUALOBJ hImage) = 0;
   virtual FX_POSITION GetFirstFilterPosition(FDE_HVISUALOBJ hImage) = 0;
-  virtual FDE_LPCIMAGEFILTERPARAMS GetNextFilter(FDE_HVISUALOBJ hImage,
-                                                 FX_POSITION& pos) = 0;
+  virtual const FDE_IMAGEFILTERPARAMS* GetNextFilter(FDE_HVISUALOBJ hImage,
+                                                     FX_POSITION& pos) = 0;
 };
 #define FDE_FILLMODE_Alternate 1
 #define FDE_FILLMODE_Winding 2
diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h
index 88e7dd4507..bfd92f5fa8 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fdp/include/fde_rdv.h
@@ -19,7 +19,7 @@ class IFDE_Image;
 class CFX_DIBitmap;
 class CFX_DIBSource;
 
-typedef struct _FDE_HDEVICESTATE { void* pData; } * FDE_HDEVICESTATE;
+typedef struct FDE_HDEVICESTATE_ { void* pData; } * FDE_HDEVICESTATE;
 
 class IFDE_RenderDevice {
  public:
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index a83e27e66c..cc08179270 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -26,9 +26,6 @@ class IFDE_XMLDoc;
 class IFDE_XMLParser;
 class IFDE_XMLSyntaxParser;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 enum FDE_XMLNODETYPE {
   FDE_XMLNODE_Unknown = 0,
   FDE_XMLNODE_Instruction,
@@ -36,18 +33,16 @@ enum FDE_XMLNODETYPE {
   FDE_XMLNODE_Text,
   FDE_XMLNODE_CharData,
 };
-typedef struct _FDE_XMLNODE {
+
+struct FDE_XMLNODE {
   int32_t iNodeNum;
   FDE_XMLNODETYPE eNodeType;
-} FDE_XMLNODE, *FDE_LPXMLNODE;
-typedef FDE_XMLNODE const* FDE_LPCXMLNODE;
+};
 typedef CFX_StackTemplate<FDE_XMLNODE> CFDE_XMLNodeStack;
+
 FX_BOOL FDE_IsXMLValidChar(FX_WCHAR ch);
 FX_BOOL FDE_IsXMLWhiteSpace(FX_WCHAR ch);
 FX_BOOL FDE_IsXMLNameChar(FX_WCHAR ch, FX_BOOL bFirstChar);
-#ifdef __cplusplus
-}
-#endif
 
 class IFDE_XMLNode {
  public:
@@ -157,23 +152,24 @@ class IFDE_XMLCharData : public IFDE_XMLDeclaration {
   virtual void GetCharData(CFX_WideString& wsCData) const = 0;
   virtual void SetCharData(const CFX_WideString& wsCData) = 0;
 };
-typedef struct _FDE_XMLREADERHANDLER {
-  void* pData;
 
-  void (*OnTagEnter)(_FDE_XMLREADERHANDLER* pThis,
+struct FDE_XMLREADERHANDLER {
+  void* pData;
+  void (*OnTagEnter)(FDE_XMLREADERHANDLER* pThis,
                      FDE_XMLNODETYPE eType,
                      const CFX_WideString& wsTagName);
-  void (*OnTagBreak)(_FDE_XMLREADERHANDLER* pThis,
+  void (*OnTagBreak)(FDE_XMLREADERHANDLER* pThis,
                      const CFX_WideString& wsTagName);
-  void (*OnTagClose)(_FDE_XMLREADERHANDLER* pThis,
+  void (*OnTagClose)(FDE_XMLREADERHANDLER* pThis,
                      const CFX_WideString& wsTagName);
-  void (*OnAttribute)(_FDE_XMLREADERHANDLER* pThis,
+  void (*OnAttribute)(FDE_XMLREADERHANDLER* pThis,
                       const CFX_WideString& wsName,
                       const CFX_WideString& wsValue);
-  void (*OnData)(_FDE_XMLREADERHANDLER* pThis,
+  void (*OnData)(FDE_XMLREADERHANDLER* pThis,
                  FDE_XMLNODETYPE eType,
                  const CFX_WideString& wsValue);
-} FDE_XMLREADERHANDLER, *FDE_LPXMLREADERHANDLER;
+};
+
 class IFDE_XMLDoc {
  public:
   static IFDE_XMLDoc* Create();
@@ -182,7 +178,7 @@ class IFDE_XMLDoc {
   virtual FX_BOOL LoadXML(IFX_Stream* pXMLStream,
                           int32_t iXMLPlaneSize = 8192,
                           int32_t iTextDataSize = 256,
-                          FDE_LPXMLREADERHANDLER pHandler = NULL) = 0;
+                          FDE_XMLREADERHANDLER* pHandler = NULL) = 0;
   virtual FX_BOOL LoadXML(IFDE_XMLParser* pXMLParser) = 0;
   virtual int32_t DoLoad(IFX_Pause* pPause = NULL) = 0;
   virtual void CloseXML() = 0;